ChangeLog: corrected after conflict

1 files changed, 0 insertions, 453 deletions

diff --git a/ChangeLog b/ChangeLog
index 8970ee9731..61261eda15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,459 +9,6 @@
 	* kernel.gpg: public keys added
 	  00411886 -  Linus Torvalds (linux-3.1.tar.sign)
 
-2011-11-15 Arjan Bouter <abouter@sourcemage.org>
-	* x11/unity-greeter: new spell, unity greeter for lightdm
-	* x11-libs/libindicator: new spell, indicator function library
-	* x11-libs/indicator-session: new spell, indicator session menu
-	* x11-libs/indicator-power: new spell, indicator power menu
-	* x11-libs/crowd-greeter: new spell, 3D crowd greeter for lightdm
-	* x11--libs/webkit-greeter: new spell, webkit based greeter for lightdm
-	* x11-libs/indicator-datetime: new spell, indicator date and time
-	* x11-libs/indicator-soundmenu: new spell, indicator sound menu
-
-2011-11-15 Ladislav Hagara <hgr@vabo.cz>
-	* gnome3-apps/aisleriot: new spell, collection of card games
-
-2011-11-13 Robin Cook <rcook@wyrms.net>
-	* e-emotion renamed to emotion
-	* New Spell: eflwebkit - a port of webkit to e17 libraries
-	* New Spell: libeweather - library to pull weather forcasts
-	* New Spell: eweather - Enlightenment module to display weather forcast
-	* New Spell: emap - map manager
-
-2011-11-12 Ismael Luceno <ismael@sourcemage.org>
-	* python-pypi/scrapely: new spell, library for extracting structured
-	  data from HTML pages
-
-2011-11-11 Arjan Bouter <abouter@sourcemage.org>
-	* x11/lightdm: new spell, display manager
-
-2011-11-09 Vlad Glagolev <stealth@sourcemage.org>
-	* chat-irc/ratbox.gpg: added public key 201FF57E (Aaron Sethman
-	  <androsyn@ratbox.org>)
-
-2011-11-08 Ismael Luceno <ismael@sourcemage.org>
-	* emacs-lisp/fill-column-indicator: new spell, An Emacs minor mode that
-	  graphically indicates the fill column
-
-2011-11-06 Sukneet Basuta <sukneet@sourcemage.org>
-	* wm-addons/i3status: new spell, a program to generate status bar information
-	  for dzen2, xmobar, etc
-
-2011-11-02 Treeve Jelbert <treeve@sourcemage.org>
-	* graphics/leptonica: new spell, image procesing tools
-
-2011-11-01 Ladislav Hagara <hgr@vabo.cz>
-	* libs/osceleton: new spell
-	  sends skeleton information from the kinect sensor via osc
-	* video/animata: new spell, real-time animation software
-
-2011-10-30 Ladislav Hagara <hgr@vabo.cz>
-	* xorg-app/xbacklight: new spell
-	  adjust backlight brightness using RandR extension
-
-2011-10-29 Treeve Jelbert <treeve@sourcemage.org>
-	* database/libzdb: new spell, databsae access library
-
-2011-10-26 Vlad Glagolev <stealth@sourcemage.org>
-	* accounts, groups: added account data for redis
-	* database/redis: new spell, open source, advanced key-value store
-	* php-pear/phpredis: new spell, PHP extension for Redis
-
-2011-10-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-	* python-pypi/boto: new spell, access to Amazon's S3 cloud
-	* python-pypi/duplicity: new spell, a tool for creating encrypted
-	  incremental backups
-
-2011-10-25 Ladislav Hagara <hgr@vabo.cz>
-	* utils/usb-modeswitch: new spell
-	  mode switching tool for controlling multiple mode USB devices
-	* utils/usb-modeswitch-data: new spell, data package for usb-modeswitch
-
-2011-10-25 Vlad Glagolev <stealth@sourcemage.org>
-	* python-pypi/python-ssh: new spell, SSH2 protocol library for Python
-
-2011-10-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-	* x11-libs/libaosd: new spell, a library for on screen displays
-
-2011-10-19 Ismael Luceno <ismael@sourcemage.org>
-	* python-pypi/openpyxl: new spell, A Python library to read/write Excel 2007 xlsx/xlsm files
-
-2011-10-18 Bor Kraljič <pyrobor@ver.si>
-	* telephony/mediastreamer: new spell, media streaming toolkit for VoIP 
-	  applications
-
-2011-10-18 Vlad Glagolev <stealth@sourcemage.org>
-	* gnome3-libs/unico: new spell, Unico Gtk+ theming engine
-
-2011-10-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-	* haskell/haskell-deepseq: new spell, deep evaluation of data structures
-	* haskell/haskell-random: new spell, a random number library
-	* python-pypi/python-lru: new spell, a LRU implementation for python
-	* fonts-x11/inconsolata: new spell, a fixed-width font
-
-2011-10-15 Ladislav Hagara <hgr@vabo.cz>
-	* crypto/tthsum: new spell, generates or checks TTH message digests
-	* science-libs/flann: new spell
-	  Fast Library for Approximate Nearest Neighbors
-	* science-libs/cminpack: new spell, C/C++ Minpack
-	* science-libs/pcl: new spell, Point Cloud Library
-
-2011-10-15 Bor Kraljič <pyrobor@ver.si>
-	* chat-im/openwengo: removed (deprecated over 180 days ago)
-	* disk/ntfsprogs: removed (deprecated over 180 days ago)
-	* graphics/greycstoration-gimp-plugin: removed (deprecated over 180 days ago)
-	* graphics/greycstoration: removed (deprecated over 180 days ago)
-	* kde4-support/policykit-kde: removed (deprecated over 180 days ago)
-	* kde4-support/polkit-qt: removed (deprecated over 180 days ago)
-	* kernels/bluez-bluefw: removed (deprecated over 180 days ago)
-	* kernels/bluez-kernel: removed (deprecated over 180 days ago)
-	* kernels/cdemu-module: removed (deprecated over 180 days ago)
-	* latex/tetex-texmf: removed (deprecated over 180 days ago)
-	* latex/tetex: removed (deprecated over 180 days ago)
-	* libs/bluez-libs: removed (deprecated over 180 days ago)
-	* libs/bluez-sdp: removed (deprecated over 180 days ago)
-	* mobile/multisync-gui: removed (deprecated over 180 days ago)
-	* mobile/multisync: removed (deprecated over 180 days ago)
-	* mobile/synce-dccm: removed (deprecated over 180 days ago)
-	* net/bluez-pan: removed (deprecated over 180 days ago)
-	* php-pear/horde-xml_svg: removed (deprecated over 180 days ago)
-	* python-pypi/bzrk: removed (deprecated over 180 days ago)
-	* utils/bluez-utils: removed (deprecated over 180 days ago)
-	* x11-toolkits/qgtkstyle: removed (deprecated over 180 days ago)
-	* xorg-app/xphelloworld: removed (deprecated over 180 days ago)
-	* xorg-app/xplsprinters: removed (deprecated over 180 days ago)
-	* xorg-app/xprehashprinterlist: removed (deprecated over 180 days ago)
-	* xorg-lib/libxp: removed (deprecated over 180 days ago)
-	* xorg-lib/libxprintapputil: removed (deprecated over 180 days ago)
-	* xorg-lib/libxprintutil: removed (deprecated over 180 days ago)
-	* odbc-drivers/picoodbc: removed, mandatory dependency (picosql) was removed
-	  long time ago (d04ecea deprecated, 11af14b removed) (fixes #284)
-
-2011-10-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-	* libs/tclap: new spell, a C++ command line parser library
-
-2011-10-14 Bor Kraljič <pyrobor@ver.si>
-	* audio-players/mpdc: removed (we no longer support qt3 (qt-x11))
-	* audio-players/prokyon3: removed (we no longer support qt3 (qt-x11))
-	* audio-soft/kaconnect: removed (we no longer support qt3 (qt-x11))
-	* audio-soft/qjackconnect: removed (we no longer support qt3 (qt-x11))
-	* cluster/openmosixview: removed (we no longer support qt3 (qt-x11))
-	* crypto/qca-tls: removed (we no longer support qt3 (qt-x11))
-	* crypto/qca: removed (we no longer support qt3 (qt-x11))
-	* graphics/qcad: removed (we no longer support qt3 (qt-x11))
-	* ham/hamfax: removed (we no longer support qt3 (qt-x11))
-	* kernels/elpp: removed (we no longer support qt3 (qt-x11))
-	* net/cutecom: removed (we no longer support qt3 (qt-x11))
-	* science/genchemlab: removed (we no longer support qt3 (qt-x11))
-	* science/orsa: removed (we no longer support qt3 (qt-x11))
-	* science/qgrid: removed (we no longer support qt3 (qt-x11))
-	* science/qucs: removed (we no longer support qt3 (qt-x11))
-	* utils/qbrew: removed (we no longer support qt3 (qt-x11))
-	* video/divxcalc: removed (we no longer support qt3 (qt-x11))
-	* x11-toolkits/qtgtk: removed (we no longer support kde3)
-	* x11-toolkits/qwt: removed (we no longer support qt3 (qt-x11))
-
-2011-10-13 Bor Kraljič <pyrobor@ver.si>
-	* audio-players/mp3kult: removed (we no longer support kde3)
-	* audio-plugins/xmmsarts: removed (we no longer support kde3)
-	* chat-irc/kmyirc: removed (we no longer support kde3)
-	* crypto/onekript: removed (we no longer support kde3)
-	* graphics/sk1: removed (we no longer support kde3)
-	* printer/epsutil: removed (we no longer support qt3 (qt-x11))
-	* shell-term-fm/yakuake: removed (we no longer support kde3)
-
-2011-10-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-	* graphics/xcalib: new spell, a tool for loading icc profiles
-
-2011-10-12 Bor Kraljič <pyrobor@ver.si>
-	* kde-core/kdelibs: removed (we no longer support kde3)
-	* kde-core/arts: removed (we no longer support kde3)
-	* kde-core/kde-i18n: removed (we no longer support kde3)
-	* kde-core/kde-profile: removed (we no longer support kde3)
-	* kde-core/kdeaddons: removed (we no longer support kde3)
-	* kde-core/kdeadmin: removed (we no longer support kde3)
-	* kde-core/kdeartwork: removed (we no longer support kde3)
-	* kde-core/kdebase: removed (we no longer support kde3)
-	* kde-core/kdebindings: removed (we no longer support kde3)
-	* kde-core/kdeedu: removed (we no longer support kde3)
-	* kde-core/kdegames: removed (we no longer support kde3)
-	* kde-core/kdegraphics: removed (we no longer support kde3)
-	* kde-core/kdemultimedia: removed (we no longer support kde3)
-	* kde-core/kdenetwork: removed (we no longer support kde3)
-	* kde-core/kdepim: removed (we no longer support kde3)
-	* kde-core/kdesdk: removed (we no longer support kde3)
-	* kde-core/kdeutils: removed (we no longer support kde3)
-	* kde-core/kdeaccessibility: removed (we no longer support kde3)
-	* kde-core/kdetoys: removed (we no longer support kde3)
-	* kde-core/kdewebdev: removed (we no longer support kde3)
-	* kde-core/: removed section files
-	* kde-apps/akregator: removed (we no longer support kde3)
-	* kde-apps/apollon: removed (we no longer support kde3)
-	* kde-apps/basket: removed (we no longer support kde3)
-	* kde-apps/bibletime: removed (we no longer support kde3)
-	* kde-apps/cdbakeoven: removed (we no longer support kde3)
-	* kde-apps/digikam: removed (we no longer support kde3)
-	* kde-apps/f4l: removed (we no longer support kde3)
-	* kde-apps/filelight: removed (we no longer support kde3)
-	* kde-apps/gwenview: removed (we no longer support kde3)
-	* kde-apps/hayes: removed (we no longer support kde3)
-	* kde-apps/k9copy: removed (we no longer support kde3)
-	* kde-apps/kalva: removed (we no longer support kde3)
-	* kde-apps/karchiver: removed (we no longer support kde3)
-	* kde-apps/kasablanca: removed (we no longer support kde3)
-	* kde-apps/katapult: removed (we no longer support kde3)
-	* kde-apps/kbarcode: removed (we no longer support kde3)
-	* kde-apps/kbear: removed (we no longer support kde3)
-	* kde-apps/kbiff: removed (we no longer support kde3)
-	* kde-apps/kbirthday: removed (we no longer support kde3)
-	* kde-apps/kboincspy: removed (we no longer support kde3)
-	* kde-apps/kchm: removed (we no longer support kde3)
-	* kde-apps/kchmviewer: removed (we no longer support kde3)
-	* kde-apps/kconnections: removed (we no longer support kde3)
-	* kde-apps/kcpufreq: removed (we no longer support kde3)
-	* kde-apps/kdar: removed (we no longer support kde3)
-	* kde-apps/kdbg: removed (we no longer support kde3)
-	* kde-apps/kdebluetooth: removed (we no longer support kde3)
-	* kde-apps/kdepimpi: removed (we no longer support kde3)
-	* kde-apps/kdesvn: removed (we no longer support kde3)
-	* kde-apps/kdetv: removed (we no longer support kde3)
-	* kde-apps/kdevelop: removed (we no longer support kde3)
-	* kde-apps/kdevmon: removed (we no longer support kde3)
-	* kde-apps/kdiff3: removed (we no longer support kde3)
-	* kde-apps/kdsl: removed (we no longer support kde3)
-	* kde-apps/kexi: removed (we no longer support kde3)
-	* kde-apps/kftpgrabber: removed (we no longer support kde3)
-	* kde-apps/kgraphviewer: removed (we no longer support kde3)
-	* kde-apps/kguitar: removed (we no longer support kde3)
-	* kde-apps/khacc: removed (we no longer support kde3)
-	* kde-apps/kickpim: removed (we no longer support kde3)
-	* kde-apps/kid3: removed (we no longer support kde3)
-	* kde-apps/kile: removed (we no longer support kde3)
-	* kde-apps/kio_sql: removed (we no longer support kde3)
-	* kde-apps/kipi-plugins: removed (we no longer support kde3)
-	* kde-apps/kiso: removed (we no longer support kde3)
-	* kde-apps/kitchensync: removed (we no longer support kde3)
-	* kde-apps/klear: removed (we no longer support kde3)
-	* kde-apps/klibido: removed (we no longer support kde3)
-	* kde-apps/kmatrix3d: removed (we no longer support kde3)
-	* kde-apps/kmldonkey: removed (we no longer support kde3)
-	* kde-apps/kmobiletools: removed (we no longer support kde3)
-	* kde-apps/kmyfirewall: removed (we no longer support kde3)
-	* kde-apps/kmymoney2: removed (we no longer support kde3)
-	* kde-apps/knemo: removed (we no longer support kde3)
-	* kde-apps/knetfilter: removed (we no longer support kde3)
-	* kde-apps/knetstats: removed (we no longer support kde3)
-	* kde-apps/knfoviewer: removed (we no longer support kde3)
-	* kde-apps/knoda: removed (we no longer support kde3)
-	* kde-apps/koffice: removed (we no longer support kde3)
-	* kde-apps/komparator: removed (we no longer support kde3)
-	* kde-apps/kompose: removed (we no longer support kde3)
-	* kde-apps/konversation: removed (we no longer support kde3)
-	* kde-apps/konverter: removed (we no longer support kde3)
-	* kde-apps/kphotoalbum: removed (we no longer support kde3)
-	* kde-apps/kplayer: removed (we no longer support kde3)
-	* kde-apps/kpowersave: removed (we no longer support kde3)
-	* kde-apps/kradio: removed (we no longer support kde3)
-	* kde-apps/krecipes: removed (we no longer support kde3)
-	* kde-apps/krename: removed (we no longer support kde3)
-	* kde-apps/krusader: removed (we no longer support kde3)
-	* kde-apps/ksambaplugin: removed (we no longer support kde3)
-	* kde-apps/ksensors: removed (we no longer support kde3)
-	* kde-apps/ksetisaver: removed (we no longer support kde3)
-	* kde-apps/ksetiwatch: removed (we no longer support kde3)
-	* kde-apps/ksim: removed (we no longer support kde3)
-	* kde-apps/ksniffer: removed (we no longer support kde3)
-	* kde-apps/ksquirrel-libs: removed (we no longer support kde3)
-	* kde-apps/ksquirrel: removed (we no longer support kde3)
-	* kde-apps/kssh: removed (we no longer support kde3)
-	* kde-apps/ksynaptics: removed (we no longer support kde3)
-	* kde-apps/ktail: removed (we no longer support kde3)
-	* kde-apps/ktechlab: removed (we no longer support kde3)
-	* kde-apps/ktnef: removed (we no longer support kde3)
-	* kde-apps/ktorrent: removed (we no longer support kde3)
-	* kde-apps/kuftp: removed (we no longer support kde3)
-	* kde-apps/kuwc: removed (we no longer support kde3)
-	* kde-apps/kvpnc: removed (we no longer support kde3)
-	* kde-apps/kwave: removed (we no longer support kde3)
-	* kde-apps/kwlan: removed (we no longer support kde3)
-	* kde-apps/kwlaninfo: removed (we no longer support kde3)
-	* kde-apps/kxmleditor: removed (we no longer support kde3)
-	* kde-apps/libkdcraw: removed (we no longer support kde3)
-	* kde-apps/libkexif: removed (we no longer support kde3)
-	* kde-apps/libkexiv2: removed (we no longer support kde3)
-	* kde-apps/libkipi: removed (we no longer support kde3)
-	* kde-apps/lineak_kdeplugins: removed (we no longer support kde3)
-	* kde-apps/maxemumtvguide: removed (we no longer support kde3)
-	* kde-apps/pcmm: removed (we no longer support kde3)
-	* kde-apps/pixieplus: removed (we no longer support kde3)
-	* kde-apps/quantadocs: removed (we no longer support kde3)
-	* kde-apps/rotatejpg: removed (we no longer support kde3)
-	* kde-apps/soundkonverter: removed (we no longer support kde3)
-	* kde-apps/tellico: removed (we no longer support kde3)
-	* kde-apps/transkode: removed (we no longer support kde3)
-	* kde-apps/umbrello: removed (we no longer support kde3)
-	* kde-apps/wlassistant: removed (we no longer support kde3)
-	* kde-apps: removed section files
-	* kde-look/baghira: removed (we no longer support kde3)
-	* kde-look/flatknifty: removed (we no longer support kde3)
-	* kde-look/kbfx: removed (we no longer support kde3)
-	* kde-look/kdmtheme: removed (we no longer support kde3)
-	* kde-look/kfiresaver3d: removed (we no longer support kde3)
-	* kde-look/kooldock: removed (we no longer support kde3)
-	* kde-look/kside-smgl: removed (we no longer support kde3)
-	* kde-look/kxdocker: removed (we no longer support kde3)
-	* kde-look/polyester: removed (we no longer support kde3)
-	* kde-look/qtcurve-kde3: removed (we no longer support kde3)
-	* kde-look/slicker: removed (we no longer support kde3)
-	* kde-look/superkaramba: removed (we no longer support kde3)
-	* kde-look/taskbar2: removed (we no longer support kde3)
-	* kde-look/tiblit: removed (we no longer support kde3)
-	* x11-toolkits/qt-x11: removed, qt3 is no longer supported by upstream
-	* audio-creation/sonik: removed (we no longer support kde3)
-	* audio-players/amarok: removed (we no longer support kde3)
-	* chat-im/kmess: removed (we no longer support kde3)
-	* disk/arson: removed (we no longer support kde3)
-	* disk/k3b-i18n: removed (we no longer support kde3)
-	* disk/k3b: removed (we no longer support kde3)
-	* disk/mount-iso: removed (we no longer support kde3)
-	* ftp/qtella: removed (we no longer support kde3)
-	* graphics/potracegui: removed (we no longer support kde3)
-	* graphics/showimg: removed (we no longer support kde3)
-	* i18n/skim: removed (we no longer support kde3)
-	* mobile/libopensync-plugin-kdepim: removed (we no longer support kde3)
-	* science/pgcalc2: removed (we no longer support kde3)
-	* science/qalculate-kde: removed (we no longer support kde3)
-	* smgl/ksorcery: removed (we no longer support kde3)
-	* video/kaffeine: removed (we no longer support kde3)
-	* video/kavi2svcd: removed (we no longer support kde3)
-	* video/kdenlive: removed (we no longer support kde3)
-	* video/kmenc15: removed (we no longer support kde3)
-	* video/kmplayer: removed (we no longer support kde3)
-	* video/ksubeditor: removed (we no longer support kde3)
-	* video/ksubtile: removed (we no longer support kde3)
-	* video/okle: removed (we no longer support kde3)
-	* x11-libs/lineak_xosdplugin: removed (we no longer support kde3)
-	* antivirus/klamav: removed (we no longer support kde3)
-	* {kde-look => kde4-look}/qtcurve-gtk2: changed sections
-	* kde-look/: removed section files
-	* audio-soft/annotator: removed, mandatory dependency (clam) was removed
-	* audio-soft/clam-networkeditor: removed, mandatory dependency (clam) was removed
-	* audio-soft/smstools: removed, mandatory dependency (clam) was removed
-	* collab/luma: removed, mandatory dependency (pyqt) was removed
-	* doc/mnemosyne: removed, mandatory dependency (pyqt) was removed
-	* libs/pykde: removed, mandatory dependency (pyqt) was removed
-	* audio-creation/ams: removed (we no longer support qt3 (qt-x11))
-	* audio-creation/cheesetracker: removed (we no longer support qt3 (qt-x11))
-	* audio-creation/ecamegapedal: removed (we no longer support qt3 (qt-x11))
-	* audio-libs/clam: removed (we no longer support qt3 (qt-x11))
-	* audio-players/madman: removed (we no longer support qt3 (qt-x11))
-	* audio-players/mixxx: removed (we no longer support qt3 (qt-x11))
-	* audio-soft/qtid3: removed (we no longer support qt3 (qt-x11))
-	* chat-im/kadu: removed (we no longer support qt3 (qt-x11))
-	* chat-im/sim-icq: removed (we no longer support qt3 (qt-x11))
-	* devel/dbus-qt3-old: removed (we no longer support qt3 (qt-x11))
-	* devel/mysqlnavigator: removed (we no longer support qt3 (qt-x11))
-	* devel/qgit: removed (we no longer support qt3 (qt-x11))
-	* devel/xxdiff: removed (we no longer support qt3 (qt-x11))
-	* disk/qtparted: removed (we no longer support qt3 (qt-x11))
-	* editors/scribus: removed (we no longer support qt3 (qt-x11))
-	* editors/yzis: removed (we no longer support qt3 (qt-x11))
-	* graphics/mm3d: removed (we no longer support qt3 (qt-x11))
-	* http/icecat: removed (we no longer support qt3 (qt-x11))
-	* libs/pyqt: removed (we no longer support qt3 (qt-x11))
-	* mobile/moto4lin: removed (we no longer support qt3 (qt-x11))
-	* mobile/rt2500_util: removed (we no longer support qt3 (qt-x11))
-	* science/xdrawchem: removed (we no longer support qt3 (qt-x11))
-	* telephony/twinkle: removed (we no longer support qt3 (qt-x11))
-	* video/camstream: removed (we no longer support qt3 (qt-x11))
-	* video/dvbcut: removed (we no longer support qt3 (qt-x11))
-	* video/emotion: removed (we no longer support qt3 (qt-x11))
-	* video/gopedit: removed (we no longer support qt3 (qt-x11))
-	* video/xjadeo: removed (we no longer support qt3 (qt-x11))
-	* wm-addons/bbconf: removed (we no longer support qt3 (qt-x11))
-	* x11-toolkits/polymer: removed (we no longer support qt3 (qt-x11))
-	* x11/qbankmanager: removed (we no longer support qt3 (qt-x11))
-	* x11/qhacc: removed (we no longer support qt3 (qt-x11))
-	* x11/quasar: removed (we no longer support qt3 (qt-x11))
-	* x11/xglobe: removed (we no longer support qt3 (qt-x11))
-	* audio-players/xsidplay: removed (we no longer support qt3 (qt-x11))
-	* audio-creation/muse: removed (we no longer support qt3 (qt-x11))
-	* audio-creation/noteedit: removed (we no longer support kde3)
-	* chat-irc/kvirc: removed (we no longer support qt3 (qt-x11))
-	* editors/pdfedit: removed (we no longer support qt3 (qt-x11))
-	* science/kst: removed (we no longer support kde3)
-	* telephony/ihu: removed (we no longer support qt3 (qt-x11))
-
-2011-10-10 Vlad Glagolev <stealth@sourcemage.org>
-	* utils/acpid2: new spell, acpid for netlink
-
-2011-10-10 Ismael Luceno <ismael@sourcemage.org>
-	* graphics/mypaint: new spell, graphics application for digital painters
-
-2011-10-09 Ladislav Hagara <hgr@vabo.cz>
-	* gnome3-libs/pygobject3: new spell, Python bindings for the GObject
-
-2011-10-08 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
-	* qgis: desktop geographic information system application
-	* grass-gdal: grass plugin for gdal
-	* grass: Geographic Resources Analysis Support System
-	* gdal: translator library for raster geospatial data formats
-	* geos: C++ spatial topology library
-	* libgeotiff: library for accessing "Geo" tags in a GeoTIFF file
-	* libwms: library to access WMS services
-	* ogdi: API for reading various raster and vector geospatial formats
-	* hdf5: HDF5 file format library and utilities
-	* hdf4: HDF4 file format library and utilities
-	* e00compr: lib to (un)compress Arc/Info Export (E00) files
-	* avcd00: lib to make Arc/Info Vector Coverages appear as E00
-
-2011-10-07 Bor Kraljič <pyrobor@ver.si>
-	* devel/gnulib: new spell, GNU Portability Library
-
-2011-10-06 Ladislav Hagara <hgr@vabo.cz>
-	* telephony/telepathy.gpg: added key 7DAA3C03 (telepathy-glib 0.15.7)
-	* gnome3-apps/gnome-color-manager: new spell, color profile manager
-	* gnome3-apps/caribou: new spell, virtual on-screen keyboard
-
-2011-10-06 Ismael Luceno <ismael@sourcemage.org>
-	* python-pypi/logilab-common: new spell, low level functionality
-	  shared among some python projects
-	* python-pypi/logilab-astng: new spell, Python Abstract Syntax Tree
-	  New Generation
-	* python-pypi/pylint: new spell, Analyzes Python source code looking
-	  for bugs and signs of poor quality
-
-2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
-	* python-pypi/fabric: new spell, simple, Pythonic tool for remote
-	  execution and deployment
-
-2011-10-03 Ladislav Hagara <hgr@vabo.cz>
-	* x11/colord: new spell, daemon that maps devices to color profiles
-
-2011-10-01 Ismael Luceno <ismael@sourcemage.org>
-	* python-pypi/dblatex: new spell, produces dvi, ps and pdf from docbook
-
-2011-10-01 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
-	* devel/qtassistantclient: new spell, some legacy files for qt4
-	* science/scidavis: new spell, an interactive plotting tool
-
-2011-09-30 Ladislav Hagara <hgr@vabo.cz>
-	* doc/itstool: new spell, convert between XML and PO using ITS
-	* gnome2-libs/yelp-tools: scripts and utilities for Yelp documentation
-
-2011-09-29 Ladislav Hagara <hgr@vabo.cz>
-	* gnome3-libs/cogl: new spell
-	  library for using 3D graphics hardware for rendering
-	* gnome3-libs/rest: new spell, RESTful web api query library
-	* gnome3-libs/gnome-online-accounts: new spell
-	  interfaces to access the user's online accounts
-	* libs/liboauth: new spell, OAuth.net API implementation
-
-2011-09-28 Bor Kraljič <pyrobor@ver.si>
-	* ftp/puregui: removed (no upstream support & unavailable dependency)
->>>>>>> c780c0c... kernel.gpg: 00411886 - Linus Torvalds (linux-3.1.tar.sign)
-
 2011-09-26 Treeve Jelbert <treeve@sourcemage.org>
 	* doc/ebook-tools: new spell - tools for converting ebook formats
 	  can be used by okular