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, 116 insertions, 0 deletions

diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
new file mode 100644
index 0000000000..92ea7ce2e5
--- /dev/null
+++ b/e-17/evas/HISTORY
@@ -0,0 +1,116 @@
+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>
+	* CONFIGURE: Ask if user wants Portable Pixmap support
+
+2008-01-28 Dale E. Edmons <linuxfan@sourcemage.org>
+	* DETAILS: Modified KEYWORDS.
+
+2008-01-28 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Optionally depends on glitz
+	  Removed optional dependency on sdl, breaks ecore
+	  glew support is also currently broken
+	  Added gif, tiff, and svg (via cairo) image loader optional dependencies
+	  edb optional depends said it was for PNG, not EDB, image loader
+
+2007-08-09 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Added optional dependency on glew
+
+2006-11-16 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: eet is no longer optional (found by Loren Hoffman (chromex))
+
+2006-03-28 David Brown <dmlb2000@gmail.com>
+	* PREPARE: set EVAS_CVS_AUTOUPDATE instead of EDJE's var
+
+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-10 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Removed broken thinktux mirror
+
+2005-11-29 Seth Woolley <seth@tautology.org>
+	* DETAILS: MD5 -> SHA512
+
+2005-11-01 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Added CVS mirror (faster than SourceForge, but 30 minutes behind)
+	  SOURCE_URL now uses $SPELL
+	  Changed MD5[0]=IGNORE to SOURCE_IGNORE=volatile
+
+2005-10-29 Eric Sandall <sandalle@sourcemage.org>
+	* PREPARE: Re-worded auto-update query
+
+2005-10-28 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Changed WEB_SITE to actual package URL
+	  Re-worded SHORT
+	  Filled in long description
+
+2005-09-21 Eric Sandall <sandalle@sourcemage.org>
+	* 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
+	* PRE_BUILD: BUILD branched to PRE_BUILD
+	  Use NOCONFIGURE=ON ./autogen.sh
+	* BUILD: Remove autogen.sh code
+	  Have OPTS passed last so user-defined options override ours
+
+2005-09-08 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* DEPENDS: removed cairo, evas release never supported it and evas cvs
+	  doesn't support it anymore
+
+2005-01-22 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Added optional dependency on directfb, X11-LIBS, fbset,
+	  OPENGL, cairo, libpng, jpeg, and valgrind
+	  Made eet and edb optional
+	* CONFIGURE: Added queries for scale sample, scale smooth, small dither
+	  mask, yuv, and buffer
+	* BUILD: Add CONFIGURE flags to OPTS
+
+2005-01-12 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: cvs VERSION=$(date +%Y%m%d)
+
+2005-01-02 Eric Sandall <sandalle@sourcemage.org>
+	* PREPARE: Default to using CVS for the rest of e-profile (mainly esmart)
+	  Rename CVS to EVAS_CVS
+	* DETAILS,BUILD: Rename CVS to EVAS_CVS
+
+2004-09-02 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS, BUILD: BUILD_API=2, reformatted
+	* DETAILS: removed MAINTAINER
+	* DEPENDS.0.6.0: removed
+
+2004-09-01 Jeremy Kolb <jkolb@brandeis.edu>
+	* DETAILS, BUILD: Support for versioning.
+	* PREPARE: added
+
+2004-04-29 Ladislav Hagara <hgr@vabo.cz>
+	* BUILD: simplified
+	* DEPENDS: added automake and libtool
+
+2004-03-11 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS, BUILD: cvs version
+
+2004-02-26 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Added dependency on freetype1 (Bug #5674)
+
+2003-11-02 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Changed requires to depends
+	* HISTORY: Formatted to Guru Handbook
+
+2003-09-22 Eric Sandall <sandalle@sourcemage.org>
+	* DEPENDS: Requires GLUT
+	* DETAILS: Cleaned up
+
+2003-05-20 Seth Woolley <seth@tautology.org>
+	* DETAILS: Modified to fix my broken SOURCEFORGE_URL fixes
+
+2003-05-18 Seth Woolley <seth@tautology.org>
+	* DETAILS: Modified for SOURCEFORGE_URL fix
+
+2002-06-12 Unet <unet@sourcemage.org>
+	* Created this.
+