Version bump.

Package-Manager: portage-2.1.4_rc11

6 files changed, 219 insertions, 26 deletions

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index 5013de29f7e5..29529f9bf207 100644
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.66 2007/12/08 18:50:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.67 2007/12/24 10:20:03 vapier Exp $
+
+*DirectFB-1.1.1 (24 Dec 2007)
+
+  24 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/DirectFB-1.1.1-headers.patch,
+  +files/DirectFB-1.1.1-pkgconfig.patch, +DirectFB-1.1.1.ebuild:
+  Version bump.
 
   08 Dec 2007; Mike Frysinger <vapier@gentoo.org> DirectFB-1.1.0.ebuild:
   Delete /usr/X11R6/ flags from build #201626 by Arfrever Frehtes Taifersar
diff --git a/dev-libs/DirectFB/DirectFB-1.1.1.ebuild b/dev-libs/DirectFB/DirectFB-1.1.1.ebuild
new file mode 100644
index 000000000000..0cf7782c0df7
--- /dev/null
+++ b/dev-libs/DirectFB/DirectFB-1.1.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-1.1.1.ebuild,v 1.1 2007/12/24 10:20:03 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE_VIDEO_CARDS="ati128 cle266 cyber5k i810 i830 mach64 matrox neomagic nsc nvidia radeon savage sis315 tdfx unichrome"
+IUSE_INPUT_DEVICES="dbox2remote elo-input gunze h3600_ts joystick keyboard dreamboxremote linuxinput lirc mutouch none permount ps2mouse serialmouse sonypijogdial wm97xx"
+
+DESCRIPTION="Thin library on top of the Linux framebuffer devices"
+HOMEPAGE="http://www.directfb.org/"
+SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc ~x86"
+IUSE="debug fbcon fusion gif jpeg mmx png sdl sse sysfs truetype v4l v4l2 zlib"
+
+#	fusion? ( >=dev-libs/linux-fusion-7.0.1 )
+DEPEND="sdl? ( media-libs/libsdl )
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	sysfs? ( sys-fs/sysfsutils )
+	zlib? ( sys-libs/zlib )
+	truetype? ( >=media-libs/freetype-2.0.1 )"
+
+pkg_setup() {
+	if [[ -z ${VIDEO_CARDS} ]] ; then
+		ewarn "All video drivers will be built since you did not specify"
+		ewarn "via the VIDEO_CARDS variable what video card you use."
+		ewarn "DirectFB supports: ${IUSE_VIDEO_CARDS} all none"
+		echo
+	fi
+	if [[ -z ${INPUT_DEVICES} ]] ; then
+		ewarn "All input drivers will be built since you did not specify"
+		ewarn "via the INPUT_DEVICES variable which input drivers to use."
+		ewarn "DirectFB supports: ${IUSE_INPUT_DEVICES} all none"
+		echo
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.9.24-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.1.1-headers.patch
+	epatch "${FILESDIR}"/${PN}-1.1.1-pkgconfig.patch
+
+	# This is only a partial fix to the X11 order issue #201626.  It's just
+	# the only part we need in order to make the issue go away.  Upstream
+	# bug tracker is currently broken, so list things to do here:
+	#  configure.in:
+	#   - only add -I/usr/X11R6/include to X11_CFLAGS as needed
+	#   - only add -L/usr/X11R6/lib to X11_LIBS as needed
+	#  systems/x11/Makefile.am:
+	#   - add $(X11_LIBS) to end of _LIBADD variables
+	sed -i \
+		-e '/X11_LIBS/s:-L/usr/X11R6/lib::' \
+		-e '/CFLAGS/s:-I/usr/X11R6/include::' \
+		configure
+}
+
+src_compile() {
+	local vidcards card input inputdrivers
+	for card in ${VIDEO_CARDS} ; do
+		has ${card} ${IUSE_VIDEO_CARDS} && vidcards="${vidcards},${card}"
+		#use video_cards_${card} && vidcards="${vidcards},${card}"
+	done
+	[[ -z ${vidcards} ]] \
+		&& vidcards="all" \
+		|| vidcards=${vidcards:1}
+	for input in ${INPUT_DEVICES} ; do
+		has ${input} ${IUSE_INPUT_DEVICES} && inputdrivers="${inputdrivers},${input}"
+		#use input_devics_${input} && inputdrivers="${inputdrivers},${input}"
+	done
+	[[ -z ${inputdrivers} ]] \
+		&& inputdrivers="all" \
+		|| inputdrivers=${inputdrivers:1}
+
+	local sdlconf="--disable-sdl"
+	if use sdl ; then
+		# since SDL can link against DirectFB and trigger a
+		# dependency loop, only link against SDL if it isn't
+		# broken #61592
+		echo 'int main(){}' > sdl-test.c
+		$(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
+			&& sdlconf="--enable-sdl" \
+			|| ewarn "Disabling SDL since libSDL.so is broken"
+	fi
+
+	econf \
+		--enable-static \
+		$(use_enable fbcon fbdev) \
+		$(use_enable mmx) \
+		$(use_enable sse) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable gif) \
+		$(use_enable truetype freetype) \
+		$(use_enable fusion multi) \
+		$(use_enable debug) \
+		$(use_enable sysfs) \
+		$(use_enable zlib) \
+		$(use_enable v4l video4linux) \
+		$(use_enable v4l2 video4linux2) \
+		${sdlconf} \
+		--with-gfxdrivers="${vidcards}" \
+		--with-inputdrivers="${inputdrivers}" \
+		--disable-vnc \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc fb.modes AUTHORS ChangeLog NEWS README* TODO
+	dohtml -r docs/html/*
+}
+
+pkg_postinst() {
+	ewarn "Each DirectFB update in the 0.9.xx series"
+	ewarn "breaks DirectFB related applications."
+	ewarn "Please run \"revdep-rebuild\" which can be"
+	ewarn "found by emerging the package 'gentoolkit'."
+	ewarn
+	ewarn "If you have an ALPS touchpad, then you might"
+	ewarn "get your mouse unexpectedly set in absolute"
+	ewarn "mode in all DirectFB applications."
+	ewarn "This can be fixed by removing linuxinput from"
+	ewarn "INPUT_DEVICES."
+}
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 11599fa096ac..4635dd4e4d8a 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -13,19 +13,18 @@ AUX DirectFB-1.0.0-headers.patch 698 RMD160 abda64eded24e06125d53b07ee6b0ab39583
 MD5 21a032b1dc5f6f78563ab7195790cbfb files/DirectFB-1.0.0-headers.patch 698
 RMD160 abda64eded24e06125d53b07ee6b0ab39583139f files/DirectFB-1.0.0-headers.patch 698
 SHA256 40bcf37f11e79b23325fcea626246cb1d4b86ce31dde439cab322d69b9538fc8 files/DirectFB-1.0.0-headers.patch 698
-AUX DirectFB-1.1.0-headers.patch 1033 RMD160 8cc1ee682b4edb94aafcfcf80ed941922bf21b7b SHA1 f13cce3db5bb664ce43b95e615fdaef0cf134027 SHA256 3681494add3219b759b14377263dbcd59c776554311866fad0f9b42c894a4d4a
-MD5 2725af899c36148c69180797b4c3ce7f files/DirectFB-1.1.0-headers.patch 1033
-RMD160 8cc1ee682b4edb94aafcfcf80ed941922bf21b7b files/DirectFB-1.1.0-headers.patch 1033
-SHA256 3681494add3219b759b14377263dbcd59c776554311866fad0f9b42c894a4d4a files/DirectFB-1.1.0-headers.patch 1033
-AUX DirectFB-1.1.0-pkgconfig.patch 796 RMD160 81690a710267dfbdc1885d42a94c4843c18c5e05 SHA1 a3da1e2c52b4fa8b5a93aad255de81dcee159403 SHA256 a011052050c3b5cc608bcfe02b47acce1379a8562183107a6bdfe11736c62c18
-MD5 d25c80c719e36d9408ea5b27802c443a files/DirectFB-1.1.0-pkgconfig.patch 796
-RMD160 81690a710267dfbdc1885d42a94c4843c18c5e05 files/DirectFB-1.1.0-pkgconfig.patch 796
-SHA256 a011052050c3b5cc608bcfe02b47acce1379a8562183107a6bdfe11736c62c18 files/DirectFB-1.1.0-pkgconfig.patch 796
+AUX DirectFB-1.1.1-headers.patch 698 RMD160 abda64eded24e06125d53b07ee6b0ab39583139f SHA1 e5c4c5396e4a1dd97744cf31df3e1ea46633e8ba SHA256 40bcf37f11e79b23325fcea626246cb1d4b86ce31dde439cab322d69b9538fc8
+MD5 21a032b1dc5f6f78563ab7195790cbfb files/DirectFB-1.1.1-headers.patch 698
+RMD160 abda64eded24e06125d53b07ee6b0ab39583139f files/DirectFB-1.1.1-headers.patch 698
+SHA256 40bcf37f11e79b23325fcea626246cb1d4b86ce31dde439cab322d69b9538fc8 files/DirectFB-1.1.1-headers.patch 698
+AUX DirectFB-1.1.1-pkgconfig.patch 637 RMD160 b560f0cb45ab3e8938bce474f1331562ba3a96a1 SHA1 aa202a8452f48f1a8ce087201bcc26ef17c97faa SHA256 f824293e1ae8ed2e632ba0196cf760459006a1e110abac348476b3982a0db036
+MD5 8f428e9f90a3a45805346c2a4a09333e files/DirectFB-1.1.1-pkgconfig.patch 637
+RMD160 b560f0cb45ab3e8938bce474f1331562ba3a96a1 files/DirectFB-1.1.1-pkgconfig.patch 637
+SHA256 f824293e1ae8ed2e632ba0196cf760459006a1e110abac348476b3982a0db036 files/DirectFB-1.1.1-pkgconfig.patch 637
 DIST DirectFB-0.9.24.tar.gz 1938861 RMD160 262b300cc00b3385f15532004aa332253d525522 SHA1 95fbde03792d21c2ac4247108b09a861ce6532dc SHA256 d2717cbd1a85a48eba9522491bbe2c74579a91af2a938dea601ef2a8c28b7f9f
 DIST DirectFB-0.9.25.1.tar.gz 2064010 RMD160 558e3eabc41635c054314d8a4c8365d648ec588d SHA1 40654da2fde2fd5539f5a0c5cdac50e1a8a52bb4 SHA256 aa1e9710ca18633ffcb74a0383fdfa39aba63e873ec9fa2ba4b7589ed2e5c56b
 DIST DirectFB-1.0.0.tar.gz 2432000 RMD160 43e8b73f2a751e8dcb240e6b6c4c34055c5337c0 SHA1 8ac354cabd9c279e8bd3cf352daddf1b19f2007f SHA256 125941749103c08a5263f2ace01aac1533420d2ff6741d2bdde79689e5d02a05
-DIST DirectFB-1.1.0-upstream-git-gfxdrivers-fixes.patch.bz2 7167 RMD160 08327bca85e6d133c282e1da19addba46adf6102 SHA1 cc353a8c027107bb037e4e384bce30ccf728d0ad SHA256 b009646ad5fc4131f73ffa549258fbfcb5ca6ff8bf93aa2abfcea5d4fa639fb8
-DIST DirectFB-1.1.0.tar.gz 2624473 RMD160 9e5dd3b44ec828dd1b2cc739d14670d7d9e7f7a9 SHA1 3d63dca2eb0325d2be567f594b7d72fe1d3734df SHA256 0ee87256a278079955d78e4f235c15a174afbb507b5434f1966cd3e5f5a3f23a
+DIST DirectFB-1.1.1.tar.gz 2614203 RMD160 08553be77c24f3f9accbe8d2304530b42bbc2e58 SHA1 93d0ea5ca4b10291ca55d1eb6fecc544966eadad SHA256 f12ec5f0864d85268a8d67e4919cb7f3d7f0e06ed6cc278c952f6c342673d931
 EBUILD DirectFB-0.9.24.ebuild 3820 RMD160 5487a7f235ea1e6fad0b0b4247fbda96a9c0ef32 SHA1 3bebdb41fa316ef9b552dd4d22a201412c293144 SHA256 2284d2013feac6b06a37e41f1ac4a35a53c0f98795c3b1b9240b8dffe9d4c0d9
 MD5 b06154f9f35313d9db5f50c65c2662d7 DirectFB-0.9.24.ebuild 3820
 RMD160 5487a7f235ea1e6fad0b0b4247fbda96a9c0ef32 DirectFB-0.9.24.ebuild 3820
@@ -38,14 +37,14 @@ EBUILD DirectFB-1.0.0.ebuild 3841 RMD160 a9d8a856027efb2fdd13bd6d34d5b7ca1186d3f
 MD5 97522c69bfe54e73d1a48c01b45b252d DirectFB-1.0.0.ebuild 3841
 RMD160 a9d8a856027efb2fdd13bd6d34d5b7ca1186d3ff DirectFB-1.0.0.ebuild 3841
 SHA256 30c51a8afd8b9b29273f94aa1688beafe47aeaad11e3a643f06361d938f32379 DirectFB-1.0.0.ebuild 3841
-EBUILD DirectFB-1.1.0.ebuild 4551 RMD160 0937bbe5cb3618c62a9fac569279c4eb3dc0d161 SHA1 a7a82ea79dd87dc36fa366e52663ea8fba80c876 SHA256 e1da0f88f55d4f235affb16ead646c5d3969b5006bbd2d13bdab7201b2696594
-MD5 a685db1112b99d71bf34850121cf68fa DirectFB-1.1.0.ebuild 4551
-RMD160 0937bbe5cb3618c62a9fac569279c4eb3dc0d161 DirectFB-1.1.0.ebuild 4551
-SHA256 e1da0f88f55d4f235affb16ead646c5d3969b5006bbd2d13bdab7201b2696594 DirectFB-1.1.0.ebuild 4551
-MISC ChangeLog 9984 RMD160 9d888aabf244e9f890daa76082535a006db7cadc SHA1 39b31f2ac7d64a9dc16deb84abcd3133e95cfe0b SHA256 ef3aebff7a19595831c7785210c3711a4c55232d8aebc32930eb0a63398ce81a
-MD5 9feb001477a1cc68ba49b08f8818f566 ChangeLog 9984
-RMD160 9d888aabf244e9f890daa76082535a006db7cadc ChangeLog 9984
-SHA256 ef3aebff7a19595831c7785210c3711a4c55232d8aebc32930eb0a63398ce81a ChangeLog 9984
+EBUILD DirectFB-1.1.1.ebuild 4431 RMD160 f4160a32be3a1a5f7f7672f7625230d759e5818b SHA1 4ca6e5e21b48bbd9c6e6618a372e8e5d25001b3a SHA256 e4896f09ccfa9478abdf0cbf75b4ce41cddc972e346fad5dbfec5b7c136dd9a3
+MD5 4e5d958c4f5dc5ad12536528cee6b468 DirectFB-1.1.1.ebuild 4431
+RMD160 f4160a32be3a1a5f7f7672f7625230d759e5818b DirectFB-1.1.1.ebuild 4431
+SHA256 e4896f09ccfa9478abdf0cbf75b4ce41cddc972e346fad5dbfec5b7c136dd9a3 DirectFB-1.1.1.ebuild 4431
+MISC ChangeLog 10186 RMD160 5f43acbc040b2446fb6fb89c0d226bc155578e78 SHA1 133fcff5335c210bb494bd3477aee30b996eeb01 SHA256 f63dffa771e750541c70dc99cee9c228d3e487ad8732a4ac0c7b0b204965041f
+MD5 b13df27e29d2f6b4e36f0d96f18a01af ChangeLog 10186
+RMD160 5f43acbc040b2446fb6fb89c0d226bc155578e78 ChangeLog 10186
+SHA256 f63dffa771e750541c70dc99cee9c228d3e487ad8732a4ac0c7b0b204965041f ChangeLog 10186
 MISC metadata.xml 754 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 SHA1 d5238147a8dc90d5171dae8675f243fe5e6a8d10 SHA256 13a9cd8be775e849708c9377176d52f107a2eed78ef2ba3917188ae9cf2aeffc
 MD5 b798773c0060701f402cec4cddc05f5d metadata.xml 754
 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 metadata.xml 754
@@ -59,13 +58,13 @@ SHA256 12103ab1135d8e247eb85bb1f5511d69b09d277abb5c126b9923c70ab79e4f6d files/di
 MD5 e7dfae5ab777b8f8d091d3739582419b files/digest-DirectFB-1.0.0 247
 RMD160 0387ce1f0771ec6b7bbdb3f1a42016337004ca6e files/digest-DirectFB-1.0.0 247
 SHA256 b15baf4009961edb14a2beaa69ec2d65181fb3e905f0417b2be9e5dc176c5b6c files/digest-DirectFB-1.0.0 247
-MD5 9f36c287fd2dddd5f7e4c61c6a73b4f7 files/digest-DirectFB-1.1.0 584
-RMD160 2f484febff634d32cc8bacafb8f9305f98a876c4 files/digest-DirectFB-1.1.0 584
-SHA256 9794cc965c920f29a9082a915134e0e485f639bd18a96017f0cf6441b16e2d19 files/digest-DirectFB-1.1.0 584
+MD5 e654844caa52a2990f7fb73bc17981f6 files/digest-DirectFB-1.1.1 247
+RMD160 9becf2e3541c47dc84e9bff692c40eeac4be0994 files/digest-DirectFB-1.1.1 247
+SHA256 af0a4a99445049a8b5077a3f8dee0509337e1a51a28b3e904a3068b6f7eda2f4 files/digest-DirectFB-1.1.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHWueKp/wUKkr7RBoRArykAKCYL1fkDa8iB7EBd1y6vAEavhM9YgCeN1zm
-bq9GucOZXovC/aeirvkqXEo=
-=HQXs
+iEYEARECAAYFAkdvh9AACgkQj9hvisErhMJWswCeIg8rnuBhwGhXnUgzCjBBskO1
+S6oAn25X2OTvufd8BAY8Ajv4043IuoIm
+=MYnL
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/DirectFB/files/DirectFB-1.1.1-headers.patch b/dev-libs/DirectFB/files/DirectFB-1.1.1-headers.patch
new file mode 100644
index 000000000000..df9ef99353d3
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.1.1-headers.patch
@@ -0,0 +1,30 @@
+Don't rely on the kernel to tell us what the cpu target is ... we'll just
+use the default values all the time instead.
+
+http://bugs.gentoo.org/152614
+
+--- lib/direct/ppcasm_memcpy_cachable.S
++++ lib/direct/ppcasm_memcpy_cachable.S
+@@ -34,8 +34,6 @@
+ 
+ #define __ASSEMBLY__
+ 
+-#include <linux/config.h>
+-
+ #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
+ #define L1_CACHE_LINE_SIZE       16
+ #define LG_L1_CACHE_LINE_SIZE     4 
+
+Don't pollute the namespace with define hacks, just use the real deal.
+
+--- include/dfb_types.h
++++ include/dfb_types.h
+@@ -60,6 +60,8 @@
+ 
+ #endif
+ 
++#include <asm/types.h>
++#define DIRECTFB_NO_CRUFT
+ #ifndef DIRECTFB_NO_CRUFT
+ #define __u8   u8
+ #define __u16  u16
diff --git a/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch b/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch
new file mode 100644
index 000000000000..01a119ec7aec
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.1.1-pkgconfig.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/200661
+
+--- DirectFB/directfb-config.in
++++ DirectFB/directfb-config.in
+@@ -306,7 +306,7 @@
+ 	 libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@"
+ 
+ 	 if test -n "$echo_static"; then
+-	    libs="$libs @DYNLIB@ @ZLIB_LIBS@"
++	    libs="$libs @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
+ 	 fi
+       fi
+ 
+--- DirectFB/directfb.pc.in
++++ DirectFB/directfb.pc.in
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
+-Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
++Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@
+ Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
diff --git a/dev-libs/DirectFB/files/digest-DirectFB-1.1.1 b/dev-libs/DirectFB/files/digest-DirectFB-1.1.1
new file mode 100644
index 000000000000..a4a4118d6959
--- /dev/null
+++ b/dev-libs/DirectFB/files/digest-DirectFB-1.1.1
@@ -0,0 +1,3 @@
+MD5 c75255049ca8d5c69afe4db58f603028 DirectFB-1.1.1.tar.gz 2614203
+RMD160 08553be77c24f3f9accbe8d2304530b42bbc2e58 DirectFB-1.1.1.tar.gz 2614203
+SHA256 f12ec5f0864d85268a8d67e4919cb7f3d7f0e06ed6cc278c952f6c342673d931 DirectFB-1.1.1.tar.gz 2614203