Add vga USE flag for bug #129534

Package-Manager: portage-2.1.2-r6

3 files changed, 34 insertions, 42 deletions

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 63d811eb4d9a..596f97273548 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/allegro
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.61 2006/11/29 20:13:19 nyhm Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.62 2007/02/02 20:25:46 nyhm Exp $
+
+  02 Feb 2007; Tristan Heaven <nyhm@gentoo.org> allegro-4.2.1.ebuild:
+  Add vga USE flag for bug #129534
 
 *allegro-4.2.1 (29 Nov 2006)
 
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 6b9b9bc9fb53..9ce3778e255c 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -50,14 +50,14 @@ EBUILD allegro-4.2.0-r2.ebuild 2638 RMD160 6e5eb7166b729b650af6134252cfb432cfd59
 MD5 530e290e583319a69de77e8ebf867b32 allegro-4.2.0-r2.ebuild 2638
 RMD160 6e5eb7166b729b650af6134252cfb432cfd592fd allegro-4.2.0-r2.ebuild 2638
 SHA256 f080e7afb9a00bf020fa7e93268e06afeaca901204108d5ef28cbfbe3d71f592 allegro-4.2.0-r2.ebuild 2638
-EBUILD allegro-4.2.1.ebuild 2627 RMD160 7aecf73d06d1d92de2662dc97528a4709369a29e SHA1 62790cf3760e291452b20c93e06c32e3fd6c3998 SHA256 09dbdc02666793e7928c8bd569a441e4d114daf5009022018b62352fb4cee0de
-MD5 3d89c8afa21a73c3f32a88ca265e21a8 allegro-4.2.1.ebuild 2627
-RMD160 7aecf73d06d1d92de2662dc97528a4709369a29e allegro-4.2.1.ebuild 2627
-SHA256 09dbdc02666793e7928c8bd569a441e4d114daf5009022018b62352fb4cee0de allegro-4.2.1.ebuild 2627
-MISC ChangeLog 7974 RMD160 bef9ee659ac2c7c32cc1768e68b68e1726cba21a SHA1 45a3e102b807093f82a9090775e5e7086d21ace3 SHA256 a902a0961cf9a1d68205c50779c21915325ab9a4baa5f0ad4064c0494acdfc59
-MD5 b3190be18be0ea21bbd58e879e0b0c09 ChangeLog 7974
-RMD160 bef9ee659ac2c7c32cc1768e68b68e1726cba21a ChangeLog 7974
-SHA256 a902a0961cf9a1d68205c50779c21915325ab9a4baa5f0ad4064c0494acdfc59 ChangeLog 7974
+EBUILD allegro-4.2.1.ebuild 2294 RMD160 6dc8a34d497932ba80a49624f02cf83dec5a7896 SHA1 a4b60bf654f32ef35a068e3bb9696977a9e47cc3 SHA256 1f68f20048fc1d48d9fece73364f46a2f5eb934ab4e0e4d0cb3916004c3a2933
+MD5 cd9a179848b94dbfce44608262c214f7 allegro-4.2.1.ebuild 2294
+RMD160 6dc8a34d497932ba80a49624f02cf83dec5a7896 allegro-4.2.1.ebuild 2294
+SHA256 1f68f20048fc1d48d9fece73364f46a2f5eb934ab4e0e4d0cb3916004c3a2933 allegro-4.2.1.ebuild 2294
+MISC ChangeLog 8080 RMD160 7b74d842711ac633c452d3a37f0edd6ecfda4b84 SHA1 f70c261f361a7e2c97aa88fd9d6bc50c04547fb7 SHA256 64dee04964e3e2f9721b395ad540196e0e0e9a0b4eb7137b622a3b21ea3cd975
+MD5 9e592dff5580007c2316ed8bc088a092 ChangeLog 8080
+RMD160 7b74d842711ac633c452d3a37f0edd6ecfda4b84 ChangeLog 8080
+SHA256 64dee04964e3e2f9721b395ad540196e0e0e9a0b4eb7137b622a3b21ea3cd975 ChangeLog 8080
 MISC metadata.xml 636 RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 SHA1 bd01d531b12f11d21d75cd91cf9fa6c34505e2de SHA256 e26af044016a39f2ef99c3796d0cee3e84ca728501af8e71d7f91bd1d9edb3bc
 MD5 69afb3c206fdd20a361ee6dbff286ace metadata.xml 636
 RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 metadata.xml 636
@@ -81,9 +81,9 @@ MD5 dcdac17d0fa4d2481c9bc63ad07e9564 files/digest-allegro-4.2.1 244
 RMD160 af7954adc5c4dd4ce9cd39fff8fb393d30c2b62e files/digest-allegro-4.2.1 244
 SHA256 fb81d91cb8e7ed036c469f90249f937d0b3039cc7a2ef92674e6e452787182fb files/digest-allegro-4.2.1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFbenldz7hIScOURERAqNMAJsFvN1QTubNI8lrRQvFC9MI51LPGACgtSXs
-4G5fBpq5VSXfvZaDi5KMapQ=
-=PLV2
+iD8DBQFFw55Rdz7hIScOURERAiw0AKC0Z2+dzNhyf6doMPLYJUuvOIK18ACfXt3L
+6tAUpcXgi/NKmqyO3V6xqu4=
+=B4KF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/allegro/allegro-4.2.1.ebuild b/media-libs/allegro/allegro-4.2.1.ebuild
index 949ca22c4a09..3660ae2ff9b2 100644
--- a/media-libs/allegro/allegro-4.2.1.ebuild
+++ b/media-libs/allegro/allegro-4.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.1.ebuild,v 1.1 2006/11/29 20:13:19 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.1.ebuild,v 1.2 2007/02/02 20:25:46 nyhm Exp $
 
-inherit flag-o-matic eutils
+inherit eutils
 
 DESCRIPTION="cross-platform multimedia library"
 HOMEPAGE="http://alleg.sourceforge.net/"
@@ -11,26 +11,28 @@ SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
 LICENSE="Allegro"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 -sparc ~x86"
-IUSE="X alsa arts doc esd fbcon mmx oss sse svga tetex"
+IUSE="X alsa arts esd fbcon mmx oss sse svga vga"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	esd? ( media-sound/esound )
 	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	X? ( x11-libs/libX11
+	X? (
+		x11-libs/libX11
 		x11-libs/libXcursor
 		x11-libs/libXext
 		x11-libs/libXpm
 		x11-libs/libXt
 		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm )
+		x11-libs/libXxf86vm
+	)
 	svga? ( media-libs/svgalib )"
 DEPEND="${RDEPEND}
-	tetex? ( virtual/tetex )
-	X? ( x11-proto/xextproto
+	X? (
+		x11-proto/xextproto
 		x11-proto/xf86dgaproto
 		x11-proto/xf86vidmodeproto
-		x11-proto/xproto )"
+		x11-proto/xproto
+	)"
 
 src_unpack() {
 	unpack ${A}
@@ -41,11 +43,10 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -fPIC -fprefetch-loop-arrays
 	econf \
 		--enable-linux \
 		--enable-static \
-		--enable-vga \
+		--disable-jackdigi \
 		$(use_enable mmx) \
 		$(use_enable sse) \
 		$(use_enable oss ossdigi) \
@@ -61,30 +62,18 @@ src_compile() {
 		$(use_enable X xwin-dga2) \
 		$(use_enable fbcon) \
 		$(use_enable svga svgalib) \
+		$(use_enable vga) \
 		|| die
-
 	emake -j1 CFLAGS="${CFLAGS}" || die "emake failed"
-
-	if use tetex ; then
-		addwrite /var/lib/texmf
-		addwrite /usr/share/texmf
-		addwrite /var/cache/fonts
-		emake docs-dvi docs-ps || die
-	fi
 }
 
 src_install() {
-	addpredict /usr/share/info
-	emake -j1 DESTDIR="${D}" \
-		install \
-		install-gzipped-man \
-		install-gzipped-info \
-		|| die "emake install failed"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
 	# Different format versions of the Allegro documentation
 	dodoc AUTHORS CHANGES THANKS readme.txt todo.txt
-	use tetex && dodoc docs/allegro.{dvi,ps}
-	use doc && dodoc examples/*
+	doman docs/man/*.3
+	doinfo docs/info/${PN}.info
 	dohtml docs/html/*
 	docinto txt
 	dodoc docs/txt/*.txt