Migrate to EAPI 2.

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

4 files changed, 58 insertions, 57 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 66bc079411da..9d38ca4aa725 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.107 2009/01/09 23:41:01 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.108 2009/03/09 20:20:41 betelgeuse Exp $
+
+  09 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> conky-1.6.1.ebuild,
+  conky-1.6.2_pre1355.ebuild:
+  Migrate to EAPI 2.
 
   09 Jan 2009; David Shakaryan <omp@gentoo.org>
   -conky-1.6.2_pre01267.ebuild, -conky-1.6.2_pre1285.ebuild,
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 7ac17dfa24d2..2cf4dbf4977a 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX conky-1.6.1-stdio.patch 299 RMD160 d4c5358424bb937deb60273738f20716fe4bd2a6 SHA1 cb9d97f56d150462628f1a5530d8c90a0ba0d01c SHA256 45dc2a627aa4ee0f41d467b666987bb33b58c3a7eed93fa5ab71e8cc23e7c299
 DIST conky-1.6.1.tar.bz2 442180 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b SHA1 1f10d7b96f61636ffc14d2b9962c6d70aaf1c1f8 SHA256 e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063
 DIST conky-1.6.2_pre1355.tar.bz2 473037 RMD160 4801346bdc526b18a26a684c087793df958883c8 SHA1 0565b59fc00664d7c5064181716a4fd990a5c203 SHA256 471cc67891fd5726fc04b6b2d05f2da40c6b5ee349c9ee2af6312891a2d4c9f5
-EBUILD conky-1.6.1.ebuild 3851 RMD160 dafda7d5978077c3e90ecdf22cd4051835548ba5 SHA1 1b3f9d5afa78a3dcecd6a7b1288c6596fd3fa185 SHA256 5c09f0270a52cfaa446ef09798eb35d5251e3d3d889a33e4ec532229c72e16d2
-EBUILD conky-1.6.2_pre1355.ebuild 3805 RMD160 814f8dd0c1a81c3c1c2819c30c742567f6e34f95 SHA1 d6b379e3ef056ce0960219796b502247c5f104fc SHA256 ef46dfd159de1a30d3f1a110aace7ed750ccca18b2956d71ba2d7d8d45321966
-MISC ChangeLog 16226 RMD160 85d50866082f3290af9486f742d18496aef2b645 SHA1 5477e867968ab2d7b064c41c588641484f88175c SHA256 3ddc984d771f97c9c5b4bd0f541245767d3215ed23bb699c65d96cd1b480fc3c
+EBUILD conky-1.6.1.ebuild 3517 RMD160 09d3ce8cd0159c265648552f3383b4bec3c14f5a SHA1 bc6f1684480ae90d4d04e6c209ba234cf2ed0f5a SHA256 1bf20b8cf3f15dcc543eae09d8df752aa98d78d6ed78f015d9dcd321f01b9006
+EBUILD conky-1.6.2_pre1355.ebuild 3498 RMD160 5a94679c702f948bad3cb8c63092be011b4f6c53 SHA1 2d2f8cd7bc37e460c0d681ace1845924d6a8f85c SHA256 5421356ae11e3080386db0cfc469c219d43b4025f4f4cc5a219d66cbb6f8e235
+MISC ChangeLog 16358 RMD160 ae18cc6c989578f754c545840d04cec647656587 SHA1 cafaa6846404945581e147a090a59c72476f5479 SHA256 e4fcf59ea6a4cb7c30b5d6a0edda95af56fe3c46454fe7dd323fb19d6c9ac269
 MISC metadata.xml 1325 RMD160 1214f29dc5bd4c5e34278b7bc1fdc41c282f09ac SHA1 0f7d6cc5c2adb768dcd54a20b79d1cf9e43b1f0f SHA256 0e5dd4c28282fcfbf5e4aab9c7dcf6decee2ad06327d6766c2247ea53d9ae5d4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm1eoYACgkQcxLzpIGCsLTXKwCeOdyN3VJD+LT/Hgc4IYmMb+0O
+zEIAn18RGxcTiPFfmjfyTQgyQhZOp7YF
+=Uq9u
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.6.1.ebuild b/app-admin/conky/conky-1.6.1.ebuild
index b1dc59852ea4..acba03c61031 100644
--- a/app-admin/conky/conky-1.6.1.ebuild
+++ b/app-admin/conky/conky-1.6.1.ebuild
@@ -1,6 +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/app-admin/conky/conky-1.6.1.ebuild,v 1.10 2008/09/21 16:03:16 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.11 2009/03/09 20:20:41 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils
 # used for epause
@@ -15,7 +17,6 @@ KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="audacious bmpx debug hddtemp ipv6 mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
 
 DEPEND_COMMON="
-	virtual/libc
 	X? (
 		x11-libs/libICE
 		x11-libs/libXext
@@ -25,7 +26,7 @@ DEPEND_COMMON="
 		x11-libs/libXdamage
 		x11-libs/libXft
 		truetype? ( >=media-libs/freetype-2 )
-		audacious? ( >=media-sound/audacious-1.4.0 )
+		audacious? ( >=media-sound/audacious-1.4.0[dbus] )
 		bmpx? ( media-sound/bmpx
 				>=sys-apps/dbus-0.35
 			)
@@ -50,32 +51,11 @@ DEPEND="
 		x11-proto/xproto
 	)"
 
-pkg_setup() {
-	if use audacious; then
-		if has_version '<media-sound/audacious-1.5.0' && ! built_with_use media-sound/audacious dbus; then
-			eerror "media-sound/audacious is not built with dbus USE flag."
-			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
-			die "media-sound/audacious needs USE=dbus"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-stdio.patch"
 }
 
 src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
-		ewarn "the ipv6 USE flag with Conky disables the port monitor."
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
 	local myconf
 	myconf="--enable-proc-uptime"
 	if useq X; then
@@ -97,13 +77,25 @@ src_compile() {
 		$(use_enable smapi) \
 		$(use_enable wifi wlan) \
 		$(use_enable !ipv6 portmon) || die "econf failed"
+}
+
+src_compile() {
+	local mymake
+	if useq ipv6 ; then
+		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
+		ewarn "the ipv6 USE flag with Conky disables the port monitor."
+		epause
+	else
+		mymake="MPD_NO_IPV6=noipv6"
+	fi
+
 	emake ${mymake} || die "compile failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html
+	dodoc ChangeLog AUTHORS README || die
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
diff --git a/app-admin/conky/conky-1.6.2_pre1355.ebuild b/app-admin/conky/conky-1.6.2_pre1355.ebuild
index 13f8b77df58c..c02bb286fb6a 100644
--- a/app-admin/conky/conky-1.6.2_pre1355.ebuild
+++ b/app-admin/conky/conky-1.6.2_pre1355.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre1355.ebuild,v 1.1 2009/01/01 03:46:14 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre1355.ebuild,v 1.2 2009/03/09 20:20:41 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils
 # used for epause
@@ -15,7 +17,6 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="audacious bmpx debug hddtemp ipv6 moc mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
 
 DEPEND_COMMON="
-	virtual/libc
 	X? (
 		x11-libs/libICE
 		x11-libs/libXext
@@ -25,7 +26,7 @@ DEPEND_COMMON="
 		x11-libs/libXdamage
 		x11-libs/libXft
 		truetype? ( >=media-libs/freetype-2 )
-		audacious? ( >=media-sound/audacious-1.4.0 )
+		audacious? ( >=media-sound/audacious-1.4.0[dbus] )
 		bmpx? ( media-sound/bmpx
 				>=sys-apps/dbus-0.35
 			)
@@ -50,25 +51,7 @@ DEPEND="
 		x11-proto/xproto
 	)"
 
-pkg_setup() {
-	if use audacious; then
-		if has_version '<media-sound/audacious-1.5.0' && ! built_with_use media-sound/audacious dbus; then
-			eerror "media-sound/audacious is not built with dbus USE flag."
-			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
-			die "media-sound/audacious needs USE=dbus"
-		fi
-	fi
-}
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
-		ewarn "the ipv6 USE flag with Conky disables the port monitor."
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
+src_configure() {
 	local myconf
 	myconf="--enable-proc-uptime"
 	if useq X; then
@@ -91,13 +74,25 @@ src_compile() {
 		$(use_enable smapi) \
 		$(use_enable wifi wlan) \
 		$(use_enable !ipv6 portmon) || die "econf failed"
-	emake ${mymake} || die "compile failed"
+}
+
+src_compile() {
+	local mymake
+	if useq ipv6 ; then
+		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
+		ewarn "the ipv6 USE flag with Conky disables the port monitor."
+		epause
+	else
+		mymake="MPD_NO_IPV6=noipv6"
+	fi
+
+	emake ${mymake} || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html
+	dodoc ChangeLog AUTHORS README || die
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect