Migreate to EAPI 2.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

3 files changed, 22 insertions, 22 deletions

diff --git a/net-p2p/museek+/ChangeLog b/net-p2p/museek+/ChangeLog
index 6ebb6c66adac..aa7961b59d4b 100644
--- a/net-p2p/museek+/ChangeLog
+++ b/net-p2p/museek+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/museek+
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.16 2008/11/17 21:51:44 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.17 2009/03/07 15:22:26 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
+  museek+-0.1.13-r3.ebuild:
+  Migreate to EAPI 2.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/museek+-0.1.13-gcc43.patch:
diff --git a/net-p2p/museek+/Manifest b/net-p2p/museek+/Manifest
index 14c5ad7de319..51717a6cd8c3 100644
--- a/net-p2p/museek+/Manifest
+++ b/net-p2p/museek+/Manifest
@@ -5,13 +5,13 @@ AUX museek+-0.1.13-gcc43.patch 2637 RMD160 d4afe3d5878e61ba6d7c7e049981148dd31f5
 AUX museek+-0.1.13-optional-deps.patch 2982 RMD160 fb285a39b704e7fb841c0319a744a870c6014740 SHA1 35d23e5347bf1971b27e6cfea2f2e891d143be89 SHA256 058496ff74454995dfef8c93775fe89a9008af3d97c327e040ca16b0eaa9d94d
 AUX museek+-0.1.13-post_release_fixes.patch 6801 RMD160 d039d8c09241dab2e93a082817197d7c14ba6212 SHA1 4ef183c740df67b8b5347083504c027586885899 SHA256 a99b83a517061efe7d1d027f669e903eb66a7be4590ade5bacfdc5523d2826ae
 DIST museek+-0.1.13.tar.bz2 1186870 RMD160 25e1febce98ee536ba380e58b052ed7113f84d06 SHA1 003cc4f7d98b8bce8cdfa969b370a5e3c10ca9a1 SHA256 e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e
-EBUILD museek+-0.1.13-r3.ebuild 2754 RMD160 fd4010d97f1a2b19b997e5049f98e6dc03237c83 SHA1 d14739e01faae170927d77c6449a42de61e5dcad SHA256 53bb5df69df1e9f9a37bcbdc96f5c77eb1ff7609898137b9d401543561942466
-MISC ChangeLog 3085 RMD160 da52a50bbdf0c88adee3320f25940755f56e74fb SHA1 e2102f8f090caae2a4b4a35dd83bf3348ae4cca6 SHA256 428a56551882b81eae73122ef23b09218316621954018f7229eff177e05375cd
+EBUILD museek+-0.1.13-r3.ebuild 2557 RMD160 4813ae4dce780a760093dc024ce1509d196f58f2 SHA1 f92d422a3125ed4d48d45ea93a0c2672675f0d17 SHA256 8ae29e27c4a1cd8b95abf8f6520d044f87e6889d198e90f2b5416f1d931f9bb8
+MISC ChangeLog 3190 RMD160 fd5aa24bc5551498bb3c63a44550d5c72802e2bc SHA1 5cc846354c5ba24ebed5f0a03a12da1325535637 SHA256 8f7817fcfbe53722f5decf71279df33f6f117abecfefbf2e90274488212f3e00
 MISC metadata.xml 404 RMD160 0b7604e0ce51d9b25045e7d0ef61af2e41d48d03 SHA1 08eedf188bce594a556952b17aaec74a5e23bc32 SHA256 2cd4e0c92e582a1b7b0278da587052cf0e4e3b3cfe39e081b697ca8266b1e1b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkkh53UACgkQAiZjviIA2XiOhQCg0d4OdVZbJ+rBmxXrgnr22BRQ
-1KcAoLQo32hKpzzoOYUXyzr1tuFc/t83
-=g8ca
+iEYEARECAAYFAkmykY4ACgkQcxLzpIGCsLS9dgCfeuckpZU73OOTNfDQ9f1K1dNk
+A/wAnje1BHoUmX46x4rJlNqiCW/AlaRg
+=sUF5
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/museek+/museek+-0.1.13-r3.ebuild b/net-p2p/museek+/museek+-0.1.13-r3.ebuild
index a096c85e88de..7e0e89b42de3 100644
--- a/net-p2p/museek+/museek+-0.1.13-r3.ebuild
+++ b/net-p2p/museek+/museek+-0.1.13-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/museek+-0.1.13-r3.ebuild,v 1.2 2008/07/28 21:33:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/museek+-0.1.13-r3.ebuild,v 1.3 2009/03/07 15:22:26 betelgeuse Exp $
 
-EAPI=1
+EAPI=2
 
 inherit qt3 eutils distutils multilib
 
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug fam gtk ncurses qsa qt3 trayicon vorbis"
 
 RDEPEND=">=dev-cpp/libxmlpp-1.0.2
+	dev-lang/python[ncurses?]
 	gtk? ( >=dev-python/pygtk-2.6.1 )
 	qt3? ( x11-libs/qt:3 )
 	qsa? ( >=dev-libs/qsa-1.1.1 )
@@ -26,15 +27,7 @@ DEPEND="${RDEPEND}
 		dev-lang/swig
 		>=dev-util/cmake-2.4.6"
 
-pkg_setup() {
-	if use ncurses && ! built_with_use dev-lang/python ncurses ; then
-		eerror "In order to build Mucous (museek ncurses client)"
-		eerror "you need dev-lang/python built with ncurses USE flag enabled."
-		die "no ncurses support in Python"
-	fi
-}
-
-src_unpack() {
+src_prepare() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-optional-deps.patch"
@@ -48,7 +41,7 @@ my_use() {
 	use $1 && echo "1" || echo "0"
 }
 
-src_compile() {
+src_configure() {
 	# Build museekd, mucous, murmur, python bindings and clients
 	local myconf="-DPREFIX=/usr -DMANDIR=share/man -DBINDINGS=1 -DCLIENTS=1"
 	myconf="${myconf} -DSWIG_DIR='$(swig -swiglib)'" # bug #192594
@@ -64,6 +57,9 @@ src_compile() {
 	fi
 
 	cmake ${myconf} || die "cmake failed"
+}
+
+src_compile() {
 	emake || die "emake failed"
 
 	# Build setup tools
@@ -74,7 +70,7 @@ src_compile() {
 src_install() {
 	# Install main stuff
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README CREDITS CHANGELOG TODO
+	dodoc README CREDITS CHANGELOG TODO || die
 
 	# Install setup tools
 	cd "${S}/setup"