Fix building w/ USE=opensync by dropping eautoreconf and using sed instead

of the --as-needed patch (bug #319795). Migrate to EAPI 3.

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

4 files changed, 28 insertions, 37 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index 6d554fc1d99b..b96f567fdc43 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/barry
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.14 2010/05/26 08:53:27 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.15 2010/10/03 05:19:55 dirtyepic Exp $
+
+  03 Oct 2010; Ryan Hill <dirtyepic@gentoo.org> barry-0.16.ebuild,
+  -files/barry-0.16-asneeded.patch:
+  Fix building w/ USE=opensync by dropping eautoreconf and using sed instead
+  of the --as-needed patch (bug #319795). Migrate to EAPI 3.
 
   26 May 2010; Thilo Bangert <bangert@gentoo.org> barry-0.16.ebuild:
   fix build (#319795)
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index 83097c056872..24a6d81dd7aa 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -1,8 +1,7 @@
 AUX 10-blackberry.rules 1983 RMD160 bea10908beef0558402b8a8888ebc0ea4e561562 SHA1 c94747478a616c67cd115662c7a5bb4ad6220611 SHA256 26d15257fc5f48089a1b8559e7ac93101bdbc4434e409214c67dda130f05159a
-AUX barry-0.16-asneeded.patch 430 RMD160 5cd87c872beac14746adef2ae875f8ae83d4296f SHA1 630c2cd645d261b1dbe583c81f4fa79c177b770c SHA256 9ff407b9507297cd25b676e4b92c94ded5d7955b47816f7985fbcbfbeda0581b
 AUX barry-0.16-gcc45.patch 310 RMD160 42a67dc4baba475a1ef0352d2efc842d21cfaf7a SHA1 3247f8f102e8e5a72be89206df0891b641ebaa1a SHA256 f341443d2de4a229eeed8409ccd7e52d3ce8cb3dc3ab5607f69657a3472785f6
 AUX blacklist-berry_charge.conf 65 RMD160 5fbc61819a71cb266a93053c99d32ea2424c5683 SHA1 5320c555ecd5b844bb4db5a238538abc472b2516 SHA256 26003dcfdf7da0a677cbc72e01615fc694ccd2e884269da9a22d722f7549386e
 DIST barry-0.16.tar.bz2 4981342 RMD160 407d1ae1d4c42a589093bd2cc4ad791f230ab23c SHA1 011b1f42c3832f30942744dc8f577dc0eaf2189c SHA256 60f0055399a6d97445e069b804bcc8a1c60f5fc999fcec385dcd4484990ec220
-EBUILD barry-0.16.ebuild 2389 RMD160 6e7bf7296f1ce26bb6aa6be40bc8c82d5ef3f457 SHA1 fb815802446cf8e4ad105e6db58e0496937b8086 SHA256 3391c4747ed84ce3800f591ab15f6e863013fd2f277bdb6ff1d67d61747e8e26
-MISC ChangeLog 2596 RMD160 d9f5340d4cc12f06b70b4ef441dbb6eade4b56b6 SHA1 ff3b810adebedd0ae6a02c5b35152102cedadb9f SHA256 d032fbd5ae457c100c35ec485e5e4248e991c21007130d3226cb063876e64b1d
+EBUILD barry-0.16.ebuild 2581 RMD160 c5b9b467f92e46d66e700f7ba98c2771067679e5 SHA1 06ea5edfc17bb786c0de626c704b36d29dbc2a61 SHA256 efa7c3c0314c1ed81785bbe8aa8367c19e3fe9c4d460394a2871061f15ddf5c0
+MISC ChangeLog 2840 RMD160 6d10d6ee1471f8148843390cb6c22e5570e3636a SHA1 01695ccba9cb042bb109c458ee317e06a6beea75 SHA256 34e9ef5e71bcaf76c21ce19853bdda92028f7b6836382f8363d7e3a1655ec357
 MISC metadata.xml 527 RMD160 0b26a71d2d7c281f28003befd27c26e22ff2aa81 SHA1 81ae6b95703926b438a9b9688430aee3e5d3f70e SHA256 5366935efc2f4074c1bd55bd309abbc4d373f29bca70c778e45ded785381dfab
diff --git a/app-pda/barry/barry-0.16.ebuild b/app-pda/barry/barry-0.16.ebuild
index dadd223bfd03..4f4f4410b1a5 100644
--- a/app-pda/barry/barry-0.16.ebuild
+++ b/app-pda/barry/barry-0.16.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.6 2010/05/26 08:53:27 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.7 2010/10/03 05:19:55 dirtyepic Exp $
 
-inherit autotools base
+EAPI="3"
 
-DESCRIPTION="Allow synchronization, backup, restore,
-program management, and charging for BlackBerry devices"
+inherit eutils
+
+DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices"
 HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
 SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
 
@@ -18,41 +19,41 @@ DEPEND="dev-libs/libusb
 	dev-libs/openssl
 	dev-util/pkgconfig
 	sys-libs/zlib
-	boost? 	( >=dev-libs/boost-1.33  )
+	boost? 	( >=dev-libs/boost-1.33 )
 	doc?	( >=app-doc/doxygen-1.5.6 )
 	gui? 	( >=dev-cpp/gtkmm-2.4
 				>=dev-cpp/libglademm-2.4
 				>=dev-cpp/glibmm-2.4
 				>=dev-libs/libtar-1.2.11-r2 )
 	opensync? ( =app-pda/libopensync-0.22* )"
+
 RDEPEND="dev-libs/libusb
 	sys-libs/zlib
-	boost?  ( >=dev-libs/boost-1.33  )
+	boost?  ( >=dev-libs/boost-1.33 )
 	gui?    ( >=dev-cpp/gtkmm-2.4
 				>=dev-cpp/libglademm-2.4
 				>=dev-cpp/glibmm-2.4 )
 	opensync? ( =app-pda/libopensync-0.22* )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc45.patch"
-	"${FILESDIR}/${P}-asneeded.patch"
-	)
-
-src_unpack(){
-	base_src_unpack
-	cd "${S}"
-	eautoreconf
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc45.patch
+	sed -i -e '/bdptest_LDADD =/ s:\(.*\):\1 ../src/libbarry.la:' tools/Makefile.in
+	# Think twice about running eautoreconf here.  Upstream seems to like
+	# patching the generated files directly and the sources don't remotely
+	# match anymore.  See bug #319795.
 }
 
-src_compile(){
+src_configure() {
 	econf \
 		$(use_enable boost) \
 		$(use_enable gui) \
 		$(use_with gui libtar /usr) \
 		$(use_with gui libz) \
 		$(use_enable opensync opensync-plugin)
+}
 
-	emake || die
+src_compile() {
+	emake || die "emake failed"
 
 	if use doc ; then
 		cd "${S}"
@@ -62,8 +63,9 @@ src_compile(){
 
 src_install() {
 	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README || die
+
 	if use doc; then
-		dodoc AUTHORS NEWS README || die
 		dohtml doc/www/doxygen/html/*  || die
 	fi
 
diff --git a/app-pda/barry/files/barry-0.16-asneeded.patch b/app-pda/barry/files/barry-0.16-asneeded.patch
deleted file mode 100644
index eb43780006a3..000000000000
--- a/app-pda/barry/files/barry-0.16-asneeded.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing as-needed issues
-
-http://bugs.gentoo.org/show_bug.cgi?id=318583
-
---- tools/Makefile.am
-+++ tools/Makefile.am
-@@ -50,7 +50,7 @@
- bjvmdebug_LDADD = ../src/libbarry.la $(LIBUSB_LIBS) -lpthread
- 
- bdptest_SOURCES = bdptest.cc
--bdptest_LDADD = ../src/libbarrydp.la
-+bdptest_LDADD = ../src/libbarry.la ../src/libbarrydp.la
- 
- bjdwp_SOURCES = bjdwp.cc
- bjdwp_LDADD = ../src/libbarry.la ../src/libbarrydp.la ../src/libbarryjdwp.la