Migrate to EAPI 2 in order to get rid of built_with_use.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

3 files changed, 30 insertions, 35 deletions

diff --git a/net-misc/sitecopy/ChangeLog b/net-misc/sitecopy/ChangeLog
index b92e68df968c..98b5f3204308 100644
--- a/net-misc/sitecopy/ChangeLog
+++ b/net-misc/sitecopy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/sitecopy
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.50 2008/06/30 20:40:11 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/ChangeLog,v 1.51 2009/08/28 21:40:24 betelgeuse Exp $
+
+  28 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  sitecopy-0.16.3_p17.ebuild:
+  Migrate to EAPI 2 in order to get rid of built_with_use.
 
   30 Jun 2008; Raúl Porcel <armin76@gentoo.org>
   -files/0.16.3-neon-28.patch, -sitecopy-0.16.3.ebuild,
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index a68d3e21281e..13eeefa86f36 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.16.3_p17-neon-29.patch 327 RMD160 22109b591e23ff62b425de8d96ea3f61574e16e6 SHA1 8d7c6d5a22ad5b8d966ecd3cd554664c99027f62 SHA256 356e9d2a3d8ad56ee4f571a0eac8246d73966f7008e8b595d994d5f754cd5452
 DIST sitecopy_0.16.3-17.diff.gz 23810 RMD160 ea21cf546d34c55295c8bda3b135d00224512d16 SHA1 cf63ca88fedef1096b89aa08bf34c1a2c43546c7 SHA256 688d6cd400b9a6166a74495bfa31838d55bddd7d6cbd7321e6faf0d3566cf7ce
 DIST sitecopy_0.16.3.orig.tar.gz 961799 RMD160 52ef3cc61b7c9b3c6c5e3f86bcc0870dcba6b56f SHA1 6e0697ed005d2cffa37cb4bdcad5729dd3c7a103 SHA256 9dd46581717bff65e1bca852490366b85077809afb64a1ad3458da35011911a9
-EBUILD sitecopy-0.16.3_p17.ebuild 1934 RMD160 1e3dd8b89af88ddba6468193067602ff61b3ea67 SHA1 4803ae24115792af79292b630900165a5ee05f60 SHA256 09afd189f563d371a2e8d8f919b7bdd97fa972d581e727c40e2f243b8e14e7ca
-MISC ChangeLog 7711 RMD160 e457da2c06dab64ca73279e206184e67a44431f7 SHA1 8305a07cd39cb5f53a2d81b058e238e94936fa2b SHA256 d2cd8338658fdb4c1b8964d98346fe18554d8c9d5fb7c461e85d42cd838cafa1
+EBUILD sitecopy-0.16.3_p17.ebuild 1543 RMD160 5baaaeed0aff0f7f1cc634e385b35ddb3ca73098 SHA1 061d03899018d142bc8b0ff917af7f156d5875ef SHA256 dc6f33b5f19a589eacb0689d7e1bd0f82181eb9c0e220013f6a7bd1b04d10d4c
+MISC ChangeLog 7857 RMD160 0b384ef72469e21d549c4c1d082806d13eff389a SHA1 21124a5407bc44a40f5f11fe3baaefc9602bacef SHA256 5a9e47fa7d7633eecc4ff0c43a6d7095332e677b9afd6728ab1874b74002edc0
 MISC metadata.xml 691 RMD160 cbe5484551bc62c73426a56762befa9b233c84b7 SHA1 9884e47420bbc2fffef748733f2642bf7e77d339 SHA256 7dfee233becac5b46cac3072159c9c5134f397c96e04661ceedd2381e71cbdd6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqYTo0ACgkQcxLzpIGCsLTNHwCfRBKIs0QSgMMV9wrWZx7H/lKx
+qbgAoIzjaTRkePIBWaQmtHLTfDyCShT0
+=BlBC
+-----END PGP SIGNATURE-----
diff --git a/net-misc/sitecopy/sitecopy-0.16.3_p17.ebuild b/net-misc/sitecopy/sitecopy-0.16.3_p17.ebuild
index fa9805aa0df9..af6208b7b46f 100644
--- a/net-misc/sitecopy/sitecopy-0.16.3_p17.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.16.3_p17.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/net-misc/sitecopy/sitecopy-0.16.3_p17.ebuild,v 1.3 2008/06/30 20:40:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.16.3_p17.ebuild,v 1.4 2009/08/28 21:40:24 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils autotools
 
@@ -18,38 +20,18 @@ KEYWORDS="~amd64 ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="rsh? ( net-misc/netkit-rsh )
-	>=net-misc/neon-0.24.6"
+	>=net-misc/neon-0.24.6[zlib?,ssl?,expat?]
+	xml? ( >=net-misc/neon-0.24.6[-expat] )"
 
 S="${WORKDIR}"/${MY_P/_/-}
 
-pkg_setup() {
-	if use zlib ; then
-		built_with_use net-misc/neon zlib || die "neon needs zlib support"
-	fi
-
-	if use ssl ; then
-		built_with_use net-misc/neon ssl || die "neon needs ssl support"
-		myconf="${myconf} --with-ssl=openssl"
-	fi
-
-	if use expat ; then
-		built_with_use net-misc/neon expat || die "neon needs expat support"
-	fi
-
-	if use xml ; then
-		built_with_use net-misc/neon expat && die "neon needs expat support disabled for
-		libxml2 support to be enabled"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
+	cd "${WORKDIR}" || die
 	# Debian patches
 	epatch ${MY_P}-${DEB_PL}.diff
 	epatch "${S}"/debian/patches/*.dpatch
 
-	cd "${S}"
+	cd "${S}" || die
 
 	# Make it work with neon .29
 	epatch "${FILESDIR}"/${PV}-neon-29.patch
@@ -62,8 +44,9 @@ src_unpack() {
 	eautomake
 }
 
-src_compile() {
-	econf ${myconf} \
+src_configure() {
+	econf \
+			$(use_with ssl ssl openssl) \
 			$(use_enable webdav) \
 			$(use_enable nls) \
 			$(use_enable rsh) \
@@ -71,8 +54,6 @@ src_compile() {
 			$(use_with xml libxml2 ) \
 			--with-neon \
 			|| die "econf failed"
-
-	emake || die "eake failed"
 }
 
 src_install() {