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

3 files changed, 25 insertions, 6 deletions

diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index 1f584bac0f..b213c131f8 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -1,13 +1,25 @@
 depends  libtool    &&
-depends  tiff       &&
-depends  libpng     &&
 depends  zlib       &&
-depends  jpeg       &&
-depends  LIBGIF     &&
 depends  freetype2  &&
 depends  xorg-libs   &&
 
 if  [  "$IMLIB2_CVS"  ==  "y"  ];  then
   depends  CVS        &&
   depends  automake-1.9   
-fi
+fi                    &&
+optional_depends 'tiff'              \
+                 '--with-tiff'       \
+                 '--without-tiff'    \
+                 'TIFF image loader' &&
+optional_depends 'libpng'            \
+                 '--with-png'        \
+                 '--without-png'     \
+                 'PNG image loader'  &&
+optional_depends 'jpeg'              \
+                 '--with-jpeg'       \
+                 '--without-jpeg'    \
+                 'JPEG image loader' &&
+optional_depends 'LIBGIF'            \
+                 '--with-gif'        \
+                 '--without-gif'     \
+                 'GIF image loader'
diff --git a/e/imlib2/DETAILS b/e/imlib2/DETAILS
index 62c40ad2f8..499af2d743 100755
--- a/e/imlib2/DETAILS
+++ b/e/imlib2/DETAILS
@@ -20,7 +20,7 @@ fi
         WEB_SITE=http://enlightenment.org/Libraries/Imlib2/
          ENTERED=20010922
       LICENSE[0]=BSD
-        KEYWORDS="enlightenment"
+        KEYWORDS="enlightenment e16 e17 library wm window-manager"
            SHORT="Successor to imlib graphics library"
 cat << EOF
 Imlib2 is the successor to Imlib. It is NOT a newer version -- it is a
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 493da357cf..d2cfbfc53d 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,6 +1,13 @@
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
+2008-02-28 Dale E. Edmons <linuxfan@sourcemage.org>
+	* DETAILS: KEYWORDS update.
+
+2007-01-25 Treeve Jelbert <treeve@sourcemage.org>
+	* DEPENDS: make all image formats optional
+	  fixes bug #14062
+
 2007-05-06 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.4.0