Revbump. Build system requires python2. pyrex became a build time

depend, moved to EAPI=3. Disabled building of bundled faad2, use only external one.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 48bd073ba6c8cf4adf96fd58bdc3cfa73aaab063..625409de2974cf253c58ff193f12d9f3c77324c7 100644 (file)
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,4 +1,6 @@
 DIST clementine-0.3.tar.gz 3917108 RMD160 b5238aa0b5dd16758205a6dde7f44bbc759b3225 SHA1 7d0337f8bbe93f6320a10776c14d211f5ba507e9 SHA256 4041f55d6bc2f3388bfc070867d1f22f7430a66aa656003c311679f548e9c582
+DIST clementine-0.4.tar.gz 4668881 RMD160 eb79fdf17648442fb7184e9eb886bd5fa3be59f2 SHA1 040c89ac76ef861017d666cd9aabb05603ea7da1 SHA256 b33b544df9c1147e3041f3380ca9e4c13991a297db6d7f2af198513788940702
 EBUILD clementine-0.3.ebuild 1711 RMD160 1ae979fdb40711f6e27ae94ae5bbc8f8dd1a1db5 SHA1 abcb44e48800127f2b754a027eda264ad90f3201 SHA256 140d09d3860ef51075958b7a8f85148c5a3c33e37e9a50ea4007f617d6da56b3
-MISC ChangeLog 1492 RMD160 6958cf24ed828546dd17e8c40d42bdc372bb522e SHA1 7daa73eef0d18245443796d47191e3aa07413352 SHA256 eb17b8971028b8547c60b6586b32169a278063d9ba2d237be57fd0a78cb94050
+EBUILD clementine-0.4.ebuild 1746 RMD160 744e5c6da7926694c6c9103495d2c581e14acc62 SHA1 1b03b770b49d965a05e4366cc7d2da3b4004c84d SHA256 3ff74ad9cdd229e1df65fae408e0bc336efad57b6807f49c55f2dff19be5aad7
+MISC ChangeLog 1649 RMD160 c12a3411324ab8b834b8618391af275ae6833e96 SHA1 51dbfac5af746a36495c53ce0f81073e46159fdd SHA256 7ef1a081e4f98e9ae5cdbdfcaf38683c09300c8ec57dbcad68144d4c414c4d79
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b

diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 6dc265d781f43c25e426ad9c29a7eac5a4d80215..423b94795a9b4303ef591257f0e215240e15c958 100644 (file)
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/xmms2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.2 2010/06/30 17:20:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.3 2010/07/01 08:22:28 slyfox Exp $
+
+*xmms2-0.7-r2 (01 Jul 2010)
+
+  01 Jul 2010; Sergei Trofimovich <slyfox@gentoo.org> -xmms2-0.7-r1.ebuild,
+  +xmms2-0.7-r2.ebuild:
+  Revision bump. Building xmms2 requires python2, pyrex became a build time
+  depend, moved to EAPI=3. Thanks to arfrever.
+  Disabled building of bundled faad2, use only external one.
+  Thanks to ssuominen.
 
 *xmms2-0.7-r1 (30 Jun 2010)
 

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index d264365b0e5a2e39dc98ad0054122257bedd2850..4f05953ce060e4b152085e3d340875bbeeb9fece 100644 (file)
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +1,5 @@
 AUX xmms2-0.7DrNo-windres-build-fix.patch 1929 RMD160 61f8840d4e4349b5459f6760b94f0a439b6cfa87 SHA1 41ccd4db5c48d70a860d59ebb323796f243774bf SHA256 f71546af163b017678282a9ded8ec8e70ea486b95f96c68a62ad5a3edf0db39f
 DIST xmms2-0.7DrNo.tar.bz2 1519973 RMD160 3a526df9fa1ed5103b6a252c34c0394bf0e4f156 SHA1 4999568654a0d2aba84bda4b22145058bbd3fcb2 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
-EBUILD xmms2-0.7-r1.ebuild 6089 RMD160 17531e6decb4f81d3c4e52319d94301516aa6239 SHA1 8ee32901c82e6d7de2f1dbc59d8cd8a563053228 SHA256 8f4f31b16c2ca9944af97d57dec5f38ae5e65065143f6b3438ae8b4feffdcf06
-MISC ChangeLog 854 RMD160 fcd2021c33699f8ae7fe289644f7dfa03ef8bacf SHA1 a5cf8898ce80ea42f5c7bb9e8efd3ef8e04f69a4 SHA256 026765411712458144b17171ccb7f36d6dea84582c17f980541c1ef7b74578a9
+EBUILD xmms2-0.7-r2.ebuild 6158 RMD160 9ed0627b1fbcea0d46d6c963c735d2377d8a2656 SHA1 09fd0e3db91e6f38d0f54aa394f428e3212ac348 SHA256 6406fc5dfb366cba7736b05c609666a31b6940f0f814b35cacf9509a9769ee65
+MISC ChangeLog 1191 RMD160 b7a8d50b36db37876a8902f21a35c48d51c1c98d SHA1 f2eae39d340c9130b5e4d9f00b9cdb5864fd3c5e SHA256 0e52fc71d36e5cefffe94e8786045bfac60e8bcf15fe81a48f9a1a41a88da8c1
 MISC metadata.xml 2543 RMD160 880160906497e70efe5a12415bcb7a97a2677fcd SHA1 37318858b1a48b7030fc2e4186b756bcb0dd4094 SHA256 62ab3169c4051f6df1393fcfdb1d70e6ba14acf23be1f18120b8f4cf6c3787fb

diff --git a/media-sound/xmms2/xmms2-0.7-r1.ebuild b/media-sound/xmms2/xmms2-0.7-r2.ebuild
similarity index 94%
rename from media-sound/xmms2/xmms2-0.7-r1.ebuild
rename to media-sound/xmms2/xmms2-0.7-r2.ebuild
index 7bf76110bb377b8e6d74b6e7d8aeb0458f1f33ab..01af53c4c21e86e48f7d2e51fa23fdab8fc0e8ef 100644 (file)
--- a/media-sound/xmms2/xmms2-0.7-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.7-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r1.ebuild,v 1.1 2010/06/30 17:20:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r2.ebuild,v 1.1 2010/07/01 08:22:28 slyfox Exp $
+
+EAPI=3
 
-EAPI=2
 inherit base eutils python
 
 MY_P="${P}DrNo"
@@ -62,11 +63,12 @@ RDEPEND="server? (
        cxx? ( >=dev-libs/boost-1.32 )
        mlib-update? ( app-admin/gamin )
        perl? ( >=dev-lang/perl-5.8.8 )
-       python? ( >=dev-python/pyrex-0.9.5.1 )
+       python? ( =dev-lang/python-2* )
        ruby? ( >=dev-lang/ruby-1.8.5 ) "
 
 DEPEND="${RDEPEND}
-       >=dev-lang/python-2.4.3"
+       =dev-lang/python-2*
+       python? ( dev-python/pyrex )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -93,6 +95,11 @@ xmms2_flag() {
        esac
 }
 
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
 src_configure() {
        # ./configure alike options.
        local waf_params="--prefix=/usr \
@@ -162,7 +169,7 @@ src_configure() {
                                        "               mac"
                                        "               mms"
                                        "               mad"
-                                       "aac            mp4"
+                                       "DISABLED       mp4" # uses bundled patched faad2
                                        "mp3            mpg123"
                                        "               modplug"
                                        "               musepack"
@@ -233,9 +240,9 @@ pkg_postinst() {
                einfo "Disable the phonehome useflag if you don't like that"
        fi
 
-       use python && python_mod_optimize "$(python_get_sitedir)/xmmsclient"
+       use python && python_mod_optimize xmmsclient
 }
 
 pkg_postrm() {
-       use python && python_mod_cleanup "$(python_get_sitedir)/xmmsclient"
+       use python && python_mod_cleanup xmmsclient
 }