Fixed various QA issues. Added check that libSDL is compiled with X support (bug...

Package-Manager: portage-2.1.4.4

diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index a00c6b62680ceba47379163d8eb27bb7ab8a2c03..d3aa5c86db1f70396161ffe91da630f0d0e21128 100644 (file)
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2008/03/03 13:44:25 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.45 2008/03/03 13:56:20 dev-zero Exp $
+
+  03 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  pygame-1.8.0_rc4.ebuild:
+  Fixed various QA issues. Added check that libSDL is compiled with X support
+  (bug #150329). And it now supports unicode (bug #154012 is therefore solved
+  as well).
 
 *pygame-1.8.0_rc4 (03 Mar 2008)
 

diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 80293c62ae33c2e1c820d1528b5f7c5a3a0aa708..7bb1a0d9e38e125188eef5c06fca32a83424b105 100644 (file)
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,6 +1,6 @@
 DIST pygame-1.7.1release.tar.gz 1279697 RMD160 2cb7a60f3f57468958d452f8daf4cf81063e1955 SHA1 cf6940e3ec4f48930ef8e4600c6decfa13ebbbea SHA256 11dfa923f5f831d2bedf476978e004efcac4cfa7d1f315dd094262265fcd8042
 DIST pygame-1.8.0rc4.tar.gz 1484331 RMD160 a9071b1701e27cb1503723fcd909779bb88ce482 SHA1 236a1f3fb31b6593e4581faa49099cafd4fb260d SHA256 3ceca44ee296ef50b70fc8f0130a1b0198199b8ee56dd1f2a7c334b8458091d8
 EBUILD pygame-1.7.1.ebuild 1130 RMD160 f428118ea14b2790d846e6db4e10385077ee44d7 SHA1 8bb6b7d7f4f6677a3f589ffd54c420db350840b1 SHA256 4f7a788c68b5fc7897847f693e203d711fbce0b83123cd54edddf877ac579aa0
-EBUILD pygame-1.8.0_rc4.ebuild 1390 RMD160 9a27d6434161756a7ea1f15bafb34e328b4b95d2 SHA1 99580a7e65556c9fb98ae907fb229fbf2c65e3c1 SHA256 5e3d8e9a4a31abfeac3c60a32abb625726169aa5d3654c041d0f3f37c1e630b8
-MISC ChangeLog 5520 RMD160 9b424deca4049303a3eef42e9a9814c4fea11d7f SHA1 19dea7312a5858d6a38dacddada5fe0b5329e924 SHA256 d8c5b9391eea3ee9252e818a9cb7cb45819106af896fe0eb218ef8602b736280
+EBUILD pygame-1.8.0_rc4.ebuild 1536 RMD160 e3eb50f75d7fde6ca2fd1990183777c14251bbcc SHA1 087926cf2a370cd18981c4ebdbe161e3ab5e1e6e SHA256 5a668eb31d880ec687fdd71bd2d4dad6995df25aac675a66a81f092bb8fcee01
+MISC ChangeLog 5769 RMD160 5bb05f6ae54c4b40f92ed8af232861d52fb33122 SHA1 431c7851cbb3cec3e7ded892bb8c8c2a430bcdcd SHA256 089c2b43c95ab70e188dbd129e5dc395c1f1900820b8738bac634018a80b4f11
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4

diff --git a/dev-python/pygame/pygame-1.8.0_rc4.ebuild b/dev-python/pygame/pygame-1.8.0_rc4.ebuild
index 6a2dbc37e445ff5bf28d59c58ca6a6fd5c422232..929ae282b54f37ba54c1bd47056987ce9a2a7c66 100644 (file)
--- a/dev-python/pygame/pygame-1.8.0_rc4.ebuild
+++ b/dev-python/pygame/pygame-1.8.0_rc4.ebuild
@@ -1,8 +1,8 @@
 # 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_rc4.ebuild,v 1.1 2008/03/03 13:44:25 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.8.0_rc4.ebuild,v 1.2 2008/03/03 13:56:20 dev-zero Exp $
 
-inherit distutils
+inherit distutils multilib eutils
 
 MY_P="${PN}-${PV/_}"
 
@@ -26,11 +26,19 @@ DEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+       if ! built_with_use media-libs/libsdl X ; then
+               eerror "Please re-emerge media-libs/libsdl with the X USE-flag set."
+               die "Missing USE-flag for media-libs/libsdl"
+       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 "sed failed"
 }
 
 src_compile() {
@@ -46,10 +54,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}
+               doins -r "${S}/examples"
        fi
 }