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

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

(Portage version: 2.2_rc88/cvs/Linux x86_64)

3 files changed, 26 insertions, 34 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/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