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

8 files changed, 35 insertions, 14 deletions

diff --git a/fonts/dejavu-ttf/DETAILS b/fonts/dejavu-ttf/DETAILS
index 78f4924174..fb3063e647 100755
--- a/fonts/dejavu-ttf/DETAILS
+++ b/fonts/dejavu-ttf/DETAILS
@@ -1,17 +1,19 @@
            SPELL=dejavu-ttf
+          SPELLX=dejavu-fonts-ttf
          PACKAGE=${SPELL%-*}
-         VERSION=2.20
-     SOURCE_HASH=sha512:cfef541811c17cd719f29b8a3a70bfad3350860e686eb2b60150afa473381c5d34564fc06838ab0b05044f14778d480eae83ecf9050a18b63fadf0d53313fdd2
-          SOURCE="$SPELL-$VERSION.tar.bz2"
+         VERSION=2.24
+     SOURCE_HASH=sha512:bee3ca7926c342b810e5a1adfd016dfc3ad48aa1908b47c4cc29bdfea175ac0128aa733923cc6ec09d2d6ad7195ef122ea5513ab3c3ad38e43842de4dde7f99a
+          SOURCE=$SPELLX-$VERSION.tar.bz2
             DOCS="README LICENSE AUTHORS NEWS BUGS *.txt"
-   SOURCE_URL[0]="$SOURCEFORGE_URL/$PACKAGE/$SOURCE"
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
-        WEB_SITE="http://$PACKAGE.sourceforge.net/"
-   FRESHMEAT_URL="http://freshmeat.net/projects/$PACKAGE/"
-      LICENSE[0]='Freely Distributable'
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$PACKAGE/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION%-*}
+        WEB_SITE=http://dejavu.sourceforge.net/
+      LICENSE[0]="Freely Distributable"
         KEYWORDS="fonts x11 libs"
-           SHORT='A font family based on the Bitstream Vera Fonts'
+           SHORT="A font family based on the Bitstream Vera Fonts"
 cat << EOF
-The DejaVu fonts are a font family based on the Bitstream Vera Fonts. Its purpose is to provide a wider range of characters while maintaining the original look and feel. The family is available as TrueType fonts and also as third-party packages for various operating systems, including handhelds.
+The DejaVu fonts are a font family based on the Bitstream Vera Fonts. Its
+purpose is to provide a wider range of characters while maintaining the
+original look and feel. The family is available as TrueType fonts and also
+as third-party packages for various operating systems, including handhelds.
 EOF
-## Auto-generated from Freshmeat.net's project descriptor
diff --git a/fonts/dejavu-ttf/HISTORY b/fonts/dejavu-ttf/HISTORY
index 20be136597..a18c00a183 100644
--- a/fonts/dejavu-ttf/HISTORY
+++ b/fonts/dejavu-ttf/HISTORY
@@ -1,3 +1,19 @@
+2008-03-10 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.24
+	  fixed WEB_SITE
+
+2008-01-22 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.23
+	  fixed long description wrap
+	  cleaned up
+
+2007-12-09 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.22
+	* INSTALL: change from directory
+
+2007-10-28 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.21
+
 2007-09-16 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.20
 
diff --git a/fonts/dejavu-ttf/INSTALL b/fonts/dejavu-ttf/INSTALL
index 1789660ed4..6d098de10b 100755
--- a/fonts/dejavu-ttf/INSTALL
+++ b/fonts/dejavu-ttf/INSTALL
@@ -1,3 +1,3 @@
 mkdir -p "$INSTALL_ROOT/usr/share/fonts/TTF" &&
-install -m 644 -o root -g root *.ttf \
+install -m 644 -o root -g root ttf/*.ttf \
 	"$INSTALL_ROOT/usr/share/fonts/TTF"
diff --git a/fonts/freefont-ttf/primoz.peterlin.gpg b/fonts/freefont-ttf/primoz.peterlin.gpg
index 9f605bdcda..6a64a7601f 100644
--- a/fonts/freefont-ttf/primoz.peterlin.gpg
+++ b/fonts/freefont-ttf/primoz.peterlin.gpg
diff --git a/fonts/ghostscript-fonts-other/ghostscript-fonts-other-6.0.tar.gz.sig b/fonts/ghostscript-fonts-other/ghostscript-fonts-other-6.0.tar.gz.sig
index 5518992329..a31d89514c 100644
--- a/fonts/ghostscript-fonts-other/ghostscript-fonts-other-6.0.tar.gz.sig
+++ b/fonts/ghostscript-fonts-other/ghostscript-fonts-other-6.0.tar.gz.sig
diff --git a/fonts/ghostscript-fonts-std/ghostscript-fonts-std-8.11.tar.gz.sig b/fonts/ghostscript-fonts-std/ghostscript-fonts-std-8.11.tar.gz.sig
index a47383d424..2570c76ed8 100644
--- a/fonts/ghostscript-fonts-std/ghostscript-fonts-std-8.11.tar.gz.sig
+++ b/fonts/ghostscript-fonts-std/ghostscript-fonts-std-8.11.tar.gz.sig
diff --git a/fonts/linuxlibertine/DETAILS b/fonts/linuxlibertine/DETAILS
index ccde35e63f..aab0ea7f35 100755
--- a/fonts/linuxlibertine/DETAILS
+++ b/fonts/linuxlibertine/DETAILS
@@ -1,7 +1,7 @@
            SPELL=linuxlibertine
           SPELLX=LinLibertineFont
-         VERSION=2.6.9
-     SOURCE_HASH=sha512:876394c00be720cf1e7498d7b3059dede6f72802b586da1bc4a20631f6b738ebbba41ba20949506fa307e251439d6115c161621b535950b1c227750a65183414
+         VERSION=2.7.9
+     SOURCE_HASH=sha512:73158fca18236f3e07b36a9741fbf643ebaf19c251bb63aea18f7b39c965d51337f22d471c8091e991b0719346a00e607b92a01e4ac0a114d43da300f0a912f5
           SOURCE=$SPELLX-${VERSION//.9}.tgz
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELLX
diff --git a/fonts/linuxlibertine/HISTORY b/fonts/linuxlibertine/HISTORY
index 604267e4af..2f24cb2d1e 100644
--- a/fonts/linuxlibertine/HISTORY
+++ b/fonts/linuxlibertine/HISTORY
@@ -1,3 +1,6 @@
+2007-12-29 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.7.9
+
 2007-06-11 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.6.9