Add check for USE='jpeg png' in sdl-image. Closes #227705

Package-Manager: portage-2.1.5.6

5 files changed, 54 insertions, 19 deletions

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 9efa3905f99f..4803412b3c4e 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygame
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.47 2008/06/20 17:53:36 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.48 2008/06/26 18:36:15 pythonhead Exp $
+
+  26 Jun 2008; Rob Cakebread <pythonhead@gentoo.org> pygame-1.7.1.ebuild,
+  pygame-1.7.1-r1.ebuild, pygame-1.8.0.ebuild:
+  Add check for USE='jpeg png' in sdl-image. Closes #227705
 
 *pygame-1.7.1-r1 (20 Jun 2008)
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index d7694260dba3..0a4d18ea5c06 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pygame-1.7.1-python2.5.patch 1530 RMD160 e874f95c2d5c92ffc2fb4fce6368b2ee49dd7d2d SHA1 cca966b33415caa8112fa31063f88e36d3af29b3 SHA256 f960da5fd30b2d502d41736c4656ba5025fb8eb5c2ff28d606f81301e9d49bed
 DIST pygame-1.7.1release.tar.gz 1279697 RMD160 2cb7a60f3f57468958d452f8daf4cf81063e1955 SHA1 cf6940e3ec4f48930ef8e4600c6decfa13ebbbea SHA256 11dfa923f5f831d2bedf476978e004efcac4cfa7d1f315dd094262265fcd8042
 DIST pygame-1.8.0release.tar.gz 1473603 RMD160 6df6f88deea5a1ef19933e6a0696e102843b293c SHA1 00ef4695efc7a666017862ae4cffc316902dd99b SHA256 ee7748e2689f41b54544e9997c42abd568b8c2d85292c4e6c0146c48b464ba82
-EBUILD pygame-1.7.1-r1.ebuild 1195 RMD160 ba36ab2eb71668545502947fc9fbae7db3a374cd SHA1 d7c345b2fe9001a7b05a035aabcc4d07de99484e SHA256 f29bbfb4425d933cf13b25b3dc6ad618952a018b987bfb83af53c47b95761b6a
-EBUILD pygame-1.7.1.ebuild 1130 RMD160 f428118ea14b2790d846e6db4e10385077ee44d7 SHA1 8bb6b7d7f4f6677a3f589ffd54c420db350840b1 SHA256 4f7a788c68b5fc7897847f693e203d711fbce0b83123cd54edddf877ac579aa0
-EBUILD pygame-1.8.0.ebuild 1339 RMD160 bff6397dc794f7f90bd4cf858c74c3240d87d08e SHA1 cadc168e242b3115d224611c4d1f705be937c1a3 SHA256 b7f6ea14d2dd04312cacb670393296bf1da18ee117093f9ab8f044dd37c7ba70
-MISC ChangeLog 6130 RMD160 e622c56e989171f2ca76c197f91dbd2633d96bd0 SHA1 99f51fdd2149b1661312957772a49aec2f994b32 SHA256 facf429e76c0c149b7aa17e5bfa67eb21bde23f6abd5104f82b62ec013477102
+EBUILD pygame-1.7.1-r1.ebuild 1424 RMD160 d7a3b681cd7365cfb90985362ef5bc32ce9b80e3 SHA1 71893df428425adb6fdd1dbb8aa4da1c4a0d2807 SHA256 6aeeffc8c0136f4a6059a3ba738def8e165e42d9b64b6cd1cb3dd0e2bab5c0c9
+EBUILD pygame-1.7.1.ebuild 1361 RMD160 4741f4e1e0db4e34a39cd523fb51b06a30b6fdab SHA1 dc73aab5da643e6197dad6a4cd3c8514c6315d19 SHA256 2ad4d3c4e0f404c772cb2489ec683ab9fda5c7784af372d317d6501cbd4334f2
+EBUILD pygame-1.8.0.ebuild 1543 RMD160 90d76d78005c25e3204fc38cb437e9a3e201b739 SHA1 f38ae8c95487f35ada5aff31b2f75f888187e457 SHA256 41e8b74cdec5ae73ba3970189350ef120ecc75ec2980638a840b00a14db5f2a8
+MISC ChangeLog 6314 RMD160 94690714415d7d9a771e4ed037c803e7193b7baa SHA1 e61231d0ff5b9088a43003181ec444920dc9074e SHA256 96f57fb68bdf2e8aaaaa5dcaff4aa993b590cf1640fcd79c2154b345e9b28443
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhj4a4ACgkQ8aihIaC/zgBtiwCg2t3w0qgJK1nPUzp2C940wz/m
+PYQAn1Z5C/gpUdDm+GGIbH6+gpvifuYy
+=kpME
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygame/pygame-1.7.1-r1.ebuild b/dev-python/pygame/pygame-1.7.1-r1.ebuild
index 4e08f65190bf..92aef45d5dd0 100644
--- a/dev-python/pygame/pygame-1.7.1-r1.ebuild
+++ b/dev-python/pygame/pygame-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.7.1-r1.ebuild,v 1.1 2008/06/20 17:53:36 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.7.1-r1.ebuild,v 1.2 2008/06/26 18:36:15 pythonhead Exp $
 
 inherit eutils distutils
 
@@ -24,10 +24,18 @@ DEPEND="virtual/python
 	>=dev-python/numeric-22.0
 	>=media-libs/smpeg-0.4.4-r1"
 
+pkg_setup() {
+	if ! built_with_use media-libs/sdl-image png jpeg ; then
+		eerror "Please re-emerge media-libs/sdl-image with the png and jpeg
+		USE-flags set."
+		die "Missing USE-flag for media-libs/sdl-image"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	# Search correct libdir for existing sdl libs
-	sed -i -e "s:/lib:/$(get_libdir):" ${S}/config_unix.py || die
+	sed -i -e "s:/lib:/$(get_libdir):" "${S}"/config_unix.py || die
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-python2.5.patch
 }
@@ -38,9 +46,9 @@ src_install() {
 
 	if use doc; then
 		dohtml -r docs/*
-		insinto /usr/share/doc/${PF}/examples
-		doins ${S}/examples/*
-		insinto /usr/share/doc/${PF}/examples/data
-		doins ${S}/examples/data/*
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+		insinto /usr/share/doc/"${PF}"/examples/data
+		doins "${S}"/examples/data/*
 	fi
 }
diff --git a/dev-python/pygame/pygame-1.7.1.ebuild b/dev-python/pygame/pygame-1.7.1.ebuild
index bb4dc7f3d37c..e6e9dd2aed8b 100644
--- a/dev-python/pygame/pygame-1.7.1.ebuild
+++ b/dev-python/pygame/pygame-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.7.1.ebuild,v 1.12 2007/08/07 07:44:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.7.1.ebuild,v 1.13 2008/06/26 18:36:15 pythonhead Exp $
 
 inherit distutils
 
@@ -24,10 +24,18 @@ DEPEND="virtual/python
 	>=dev-python/numeric-22.0
 	>=media-libs/smpeg-0.4.4-r1"
 
+pkg_setup() {
+	if ! built_with_use media-libs/sdl-image png jpeg ; then
+		eerror "Please re-emerge media-libs/sdl-image with the png and jpeg
+		USE-flags set."
+		die "Missing USE-flag for media-libs/sdl-image"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	# Search correct libdir for existing sdl libs
-	sed -i -e "s:/lib:/$(get_libdir):" ${S}/config_unix.py || die
+	sed -i -e "s:/lib:/$(get_libdir):" "${S}"/config_unix.py || die
 }
 
 src_install() {
@@ -36,9 +44,9 @@ src_install() {
 
 	if use doc; then
 		dohtml -r docs/*
-		insinto /usr/share/doc/${PF}/examples
-		doins ${S}/examples/*
-		insinto /usr/share/doc/${PF}/examples/data
-		doins ${S}/examples/data/*
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+		insinto /usr/share/doc/"${PF}"/examples/data
+		doins "${S}"/examples/data/*
 	fi
 }
diff --git a/dev-python/pygame/pygame-1.8.0.ebuild b/dev-python/pygame/pygame-1.8.0.ebuild
index f9d76b84e4a0..715fa05bfd83 100644
--- a/dev-python/pygame/pygame-1.8.0.ebuild
+++ b/dev-python/pygame/pygame-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.8.0.ebuild,v 1.1 2008/04/09 04:44:35 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.8.0.ebuild,v 1.2 2008/06/26 18:36:15 pythonhead Exp $
 
 inherit distutils multilib eutils
 
@@ -29,6 +29,11 @@ pkg_setup() {
 		eerror "Please re-emerge media-libs/libsdl with the X USE-flag set."
 		die "Missing USE-flag for media-libs/libsdl"
 	fi
+	if ! built_with_use media-libs/sdl-image png jpeg ; then
+		eerror "Please re-emerge media-libs/sdl-image with the png and jpeg
+		USE-flags set."
+		die "Missing USE-flag for media-libs/sdl-image"
+	fi
 }
 
 src_compile() {