Merge branch 'xorg-modular' of /home/sandalle/scm/git/smgl/grimoire/ into xorg-modular

Remember kids, make sure your branch is up-to-date *before* you do a bunch of
work on it. :(

Conflicts:

	ChangeLog
	audio-creation/qsynth/HISTORY
	audio-creation/rosegarden/HISTORY
	audio-drivers/nas/BUILD
	audio-drivers/nas/HISTORY
	audio-drivers/pulseaudio/HISTORY
	audio-soft/qjackctl/DEPENDS
	audio-soft/qjackctl/HISTORY
	chat-im/gajim/DEPENDS
	chat-im/gajim/HISTORY
	devel/gambas2/HISTORY
	devel/tk/HISTORY
	display/directfb/HISTORY
	display/qingy/HISTORY
	e/e17/DEPENDS
	e/e17/HISTORY
	e/e_module-bling/HISTORY
	e/ecore/DEPENDS
	e/ecore/HISTORY
	e/evas/DEPENDS
	e/evas/HISTORY
	e/imlib2/HISTORY
	editors/lyx/HISTORY
	editors/openoffice/HISTORY
	editors/vim/HISTORY
	gnome2-apps/gthumb2/HISTORY
	gnome2-libs/java-access-bridge/HISTORY
	gnome2-libs/libxklavier/HISTORY
	gnome2-libs/pango/HISTORY
	graphics-libs/cegui/DEPENDS
	graphics-libs/cegui/HISTORY
	graphics-libs/cimg/HISTORY
	graphics-libs/devil/HISTORY
	graphics-libs/freeglut/DEPENDS
	graphics-libs/freeglut/HISTORY
	graphics-libs/freetype1/HISTORY
	graphics-libs/mesalib/HISTORY
	graphics-libs/mesalib/PRE_BUILD
	graphics-libs/vips/HISTORY
	graphics/fontforge/HISTORY
	graphics/freewrl/HISTORY
	graphics/imagemagick/HISTORY
	graphics/mesademos/HISTORY
	graphics/ploticus/HISTORY
	haskell/haskell-x11/HISTORY
	http/elinks/HISTORY
	http/links-twibright/HISTORY
	http/seamonkey/HISTORY
	http/xulrunner/HISTORY
	kde-apps/kid3/HISTORY
	kde-core/kdebase/HISTORY
	kde4/HISTORY
	kde4/KDE_DEPENDS
	kernels/synaptics/DEPENDS
	kernels/synaptics/HISTORY
	libs/sdl/HISTORY
	mail/exim/HISTORY
	mobile/gnokii/HISTORY
	mobile/gpsd/DEPENDS
	mobile/gpsd/HISTORY
	perl-cpan/perl-gd/HISTORY
	perl-cpan/perl-tk/HISTORY
	php-pear/php-dev/HISTORY
	php-pear/php/HISTORY
	php-pear/php4/HISTORY
	printer/ghostscript/HISTORY
	science-libs/vtk/HISTORY
	science/xaos/HISTORY
	shell-term-fm/mc/HISTORY
	shell-term-fm/mlterm/HISTORY
	shell-term-fm/rxvt-unicode/HISTORY
	shell-term-fm/worker/DEPENDS
	shell-term-fm/worker/HISTORY
	shell-term-fm/x3270/HISTORY
	shell-term-fm/yeahconsole/HISTORY
	utils/beagle/HISTORY
	utils/dbus/DEPENDS
	utils/dbus/HISTORY
	utils/gnuplot/HISTORY
	utils/sunbird/HISTORY
	utils/xen-tools/HISTORY
	video-libs/gst-plugins-base/HISTORY
	video-libs/gst-plugins-good/HISTORY
	video-libs/xine-lib/HISTORY
	video/mplayer/DEPENDS
	video/mplayer/HISTORY
	video/transcode/HISTORY
	video/xvattr/HISTORY
	windowmanagers/aewm++/HISTORY
	windowmanagers/dwm/HISTORY
	windowmanagers/evilwm/HISTORY
	windowmanagers/fluxbox/HISTORY
	windowmanagers/fvwm/HISTORY
	windowmanagers/icewm/DEPENDS
	windowmanagers/icewm/HISTORY
	windowmanagers/ion3/DEPENDS
	windowmanagers/ion3/HISTORY
	windowmanagers/kahakai/DEPENDS
	windowmanagers/kahakai/HISTORY
	windowmanagers/larswm/HISTORY
	windowmanagers/openbox/HISTORY
	windowmanagers/papuawm/DEPENDS
	windowmanagers/papuawm/HISTORY
	windowmanagers/pekwm/HISTORY
	windowmanagers/pwm/HISTORY
	windowmanagers/windowlab/HISTORY
	windowmanagers/windowmaker/HISTORY
	windowmanagers/wm2/HISTORY
	windowmanagers/wmi/DEPENDS
	windowmanagers/wmi/HISTORY
	windowmanagers/wmii/DEPENDS
	windowmanagers/wmii/HISTORY
	wm-addons/dzen2/HISTORY
	wm-addons/twin/HISTORY
	x11-libs/cairo/HISTORY
	x11-libs/dri/HISTORY
	x11-libs/wine/DEPENDS
	x11-libs/wine/HISTORY
	x11-toolkits/fltk/HISTORY
	x11-toolkits/fox/HISTORY
	x11-toolkits/gtk+2/HISTORY
	x11-toolkits/nucleo/HISTORY
	x11-toolkits/openmotif/DEPENDS
	x11-toolkits/openmotif/HISTORY
	x11-toolkits/qt4/HISTORY
	x11-toolkits/wxgtk/HISTORY
	x11/conky/HISTORY
	x11/fbpanel/HISTORY
	x11/gkrellm2/HISTORY
	x11/vnc/DEPENDS
	x11/vnc/HISTORY
	x11/xcompmgr/DEPENDS
	x11/xcompmgr/HISTORY
	x11/xdaliclock/HISTORY
	x11/xosview/HISTORY
	xfce/libxfce4mcs/DEPENDS
	xfce/libxfce4mcs/HISTORY
	xfce/xfce4-profile/DEPENDS
	xfce/xfce4-profile/HISTORY
	xfce/xfwm4/HISTORY

1 files changed, 220 insertions, 0 deletions

diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
new file mode 100644
index 0000000000..2dc049fa6e
--- /dev/null
+++ b/e-17/e17/HISTORY
@@ -0,0 +1,220 @@
+2008-03-18 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
+
+2008-03-04 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Increment PATCHLEVEL to install updated e17update
+	* e17update: Also check e (e.g. imlib2)
+
+2008-03-02 Ladislav Hagara <hgr@vabo.cz>
+	* e17update: e -> e-17
+
+2008-02-27 Dale E. Edmons <linuxfan@sourcemage.org>
+	* DETAILS: Added KEYWORDS
+
+2008-02-19 Arjan Bouter <abouter@sourcemage.org>
+	* DEPENDS: moved libx* deps to ecore, where they are actually checked.
+
+2007-09-30 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DEPENDS: fixed check for xorg-modular
+
+2007-06-19 Philippe Caseiro <puppetmaster@sourcemage.org>
+	* DEPENDS: Adding optional depend for e_dbus
+
+2007-03-24 Mark Bainter <mbainter-smgl@lostinagoodbook.org>
+	* DEPENDS: Adding efreet to address bug #13650
+
+2006-12-11 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DEPENDS: it never supported esound
+
+2006-11-16 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Optionally depend on dejavu-ttf (default E17 font)
+
+2006-11-08 Eric Sandall <sandalle@sourcemage.org>
+	* starte17: Proper way to start e17 is `enlightenment_start`
+	* DETAILS: Updated PATCHLEVEL=2
+
+2006-10-24 George Sherwood <george@beernabeer.com>
+	* PRE_BUILD: Update to use automake-1.9
+	* DEPENDS: depends automake-1.9
+
+2006-08-15 Juuso Alasuutari <iuso@sourcemage.org>
+	* DETAILS: [automated] Removed UPDATED (deprecated in favor of 
+	  PATCHLEVEL).
+
+2006-05-24 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Depends on X11-LIBS for provider check
+	  If xorg-server is providing X11-LIBS, depend on libxcursor,
+	  libxinerama (not sure why disabling Xinerama in xorg works, but
+	  not having libxinerama installed doesn't), libxdamage, and
+	  libxrandr
+
+2006-03-31 Ladislav Hagara <hgr@vabo.cz>
+	* e17update: summon -d -> summon, CVS spells have FORCE_DOWNLOAD=on
+	  fixed problem with repeated downloading of Eterm-bg-0.9.3.tar.gz
+
+2006-03-28 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: new SOURCE_URL, CVS is no longer hosted on SF
+
+2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
+2006-02-15 Arjan Bouter <abouter@sourcemage.org>
+	* INSTALL: call install_wmfiles
+
+2006-02-13 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Added PATCHLEVEL=1 to remove extra xsession entry
+	* INSTALL: e17 installs enlightenment.desktop for us (not e17.desktop as
+	  I looked for earlier)
+	* e17.desktop: Removed our .desktop file in favour of e's
+
+2006-02-10 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Removed broken thinktux mirror
+	* INSTALL: startenlightenment17 and enlightenment17.desktop renamed
+	* startenlightenment17: Renamed to starte17 to match e16's naming
+	* enlightenment17.desktop: Renamed to e17.desktop to match e16's naming
+
+2006-01-19 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Added dependency on evas
+
+2006-01-07 Eric Sandall <sandalle@sourcemage.org>
+	* e17update: Added option to do only a CVS checkout (using summon)
+
+2005-12-18 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Removed e16 checks and information
+	  ENLIGHTENMENT_CVS_AUTOUPDATE renamed to ENLIGHTENMENT17_CVS_AUTOUPDATE
+	  Modified SHORT and long descriptions to mention E17
+	  Changed SPELL to e17
+	  Changed SOURCE and SOURCE_DIRECTORY to use enlightenment instead of SPELL
+	* PREPARE: Removed e16 queries
+	  ENLIGHTENMENT_CVS_AUTOUPDATE renamed to ENLIGHTENMENT17_CVS_AUTOUPDATE
+	* DEPENDS: Removed e16 dependencies
+	* PRE_BUILD: Don't check for CVS
+	* INSTALL: Install e17update always
+	  Updated to e17 names
+	* enlightenment.desktop: Renamed to enlightenment17.desktop
+	  Updated to e17 names
+	* startenlightenment: Renamed to startenlightenment17
+
+2005-11-29 Seth Woolley <seth@tautology.org>
+	* DETAILS: MD5 -> SHA512
+
+2005-11-01 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Added a CVS mirror (faster than SF.net, but 30 minutes behind)
+	  Use SOURCE_IGNORE=volatile instead of MD5[0]=IGNORE
+	  Shortened SHORT
+
+2005-10-29 Eric Sandall <sandalle@sourcemage.org>
+	* PREPARE: Re-worded auto-update query
+
+2005-10-18 Eric Sandall <sandalle@sourcemage.org>
+	* e17update: Simple script to update e17 'cvs' packages
+	* INSTALL: Install e17update for e17 only
+	  Use INSTALL_ROOT for installing other scripts as well
+	  Use `mkdir -p` for /usr/share/xsessions
+
+2005-09-27 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Check ENLIGHTENMENT_CVS not just ENLIGHTENMENT
+
+2005-09-21 Eric Sandall <sandalle@sourcemage.org>
+	* Renamed DR17 to ENLIGHTENMENT_CVS
+	* PREPARE,DETAILS: Updated to proper multi-version support
+	  See http://www.sourcemage.org/grimoire/spell_multi_version
+	  Removed BUILD_API=2, section-wide now
+	* DEPENDS: Added missing dependency on CVS if needed
+	* BUILD,PRE_BUILD: BUILD renamed to PRE_BUILD
+	  Use NOCONFIGURE=ON ./autogen.sh
+	  Pass OPTS last
+
+2005-07-15 Ladislav Hagara <hgr@vabo.cz>
+	* PREPARE, DETAILS, BUILD: tested and submitted to grimoire [Bug 9206]
+
+2005-07-12 Jeremy Blosser <jblosser-smgl@firinn.org>
+	* PREPARE, DETAILS, BUILD: Add a DR16 CVS install option
+
+2005-03-17 Eric Sandall <eric@sansall.us>
+	* BUILD: Don't apply the noslodown.patch
+	* CONFIGURE,noslodown.patch: Removed
+	* startenlightenment: Moved the slowdown information to here
+
+2005-03-09 Eric Sandall <sandalle@sourcemage.org>
+	* CONFIGURE: Query for noslowdown.patch if using DR17
+	* BUILD: Apply noslowdown.patch if wanted and using DR17
+	* noslodown.patch: Remove artificial startup slowdown of DR17
+
+2005-01-12 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: cvs VERSION=$(date +%Y%m%d)
+
+2004-12-17 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7.2
+
+2004-12-15 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS, BUILD, DEPENDS: added support for E17
+	* PREPARE: added
+
+2004-09-02 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7.1
+
+2004-08-23 Eric Sandall <sandalle@sourcemage.org>
+	* INSTALL: Added to install startup scripts
+	* enlightenment.desktop, startenlightenment: Added startup scripts
+
+2004-07-25 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7
+
+2004-07-20 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7-pre6, BUILD_API=2
+	* BUILD: converted to BUILD_API=2
+
+2004-07-06 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7-pre5
+
+2004-06-21 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7-pre4
+
+2004-06-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7-0.65 (pre3)
+
+2004-05-17 Ladislav Hagara <hgr@vabo.cz>
+	* DEPENDS: now only imlib2 [Bug 6864] and esound
+	* BUILD: removed sedit, used default_build
+
+2004-05-13 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.16.7-0.60 (pre2)
+
+2003-11-06 Justin Rocha <jrocha@sourcemage.org>
+	* DETAILS: Version bump to 0.16.6, changed SOURCE_DIRECTORY to match
+
+2003-10-09 Justin Rocha <jrocha@sourcemage.org>
+	* DETAILS: Version bump to 0.16.6-pre8
+	* HISTORY: Minor fixing, to go with new format
+	* DEPENDS: Removed useless optional_depends on libhttp
+
+2003-08-26 Justin Rocha <jrocha@sourcemage.org>
+	* DETAILS: Bumped version to 0.16.6-pre6, hopefully the last -pre
+
+2003-08-19 Justin Rocha <jrocha@sourcemage.org>
+	* DETAILS: Bumped version to 0.16.6-pre5.
+
+2003-01-31 Tom Garland <tgarland@email.com>
+	* BUILD: Added $OPTS to BUILD file.
+
+2002-12-18 Tom Garland <tgarland@email.com>
+	* Fixed bug 1757, DETAILS formatting.
+
+2002-10-14 Laurent Wandrebeck <wandre.l@free.fr>
+	* Added SMGL Mirror URL.
+
+2002-10-08 Laurent Wandrebeck <wandre.l@free.fr>
+	* Make use of $SOURCEFORGE_URL.
+	* Updated WEB_SITE.
+
+2002-08-21 Laurent Wandrebeck <wandre.l@free.fr>
+	* Updated MD5[0] to reflect Grimoire Gurus Handbook 2.3.
+	* Updated HISTORY file format for the same reason.
+
+2002-08-19 Laurent Wandrebeck <wandre.l@free.fr>
+	* Added and filled up MD5[0] and LICENSE[0].
+
+2002-08-19 Laurent Wandrebeck <wandre.l@free.fr>
+	* Added missing HISTORY file.
+