| 1 |
dirtyepic 10/10/03 05:19:55 |
| 2 |
|
| 3 |
Modified: ChangeLog barry-0.16.ebuild |
| 4 |
Log: |
| 5 |
Fix building w/ USE=opensync by dropping eautoreconf and using sed instead |
| 6 |
of the --as-needed patch (bug #319795). Migrate to EAPI 3. |
| 7 |
|
| 8 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.15 app-pda/barry/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/barry/ChangeLog?rev=1.15&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/barry/ChangeLog?rev=1.15&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/barry/ChangeLog?r1=1.14&r2=1.15 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v |
| 20 |
retrieving revision 1.14 |
| 21 |
retrieving revision 1.15 |
| 22 |
diff -u -r1.14 -r1.15 |
| 23 |
--- ChangeLog 26 May 2010 08:53:27 -0000 1.14 |
| 24 |
+++ ChangeLog 3 Oct 2010 05:19:55 -0000 1.15 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for app-pda/barry |
| 27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.14 2010/05/26 08:53:27 bangert Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.15 2010/10/03 05:19:55 dirtyepic Exp $ |
| 30 |
+ |
| 31 |
+ 03 Oct 2010; Ryan Hill <dirtyepic@g.o> barry-0.16.ebuild, |
| 32 |
+ -files/barry-0.16-asneeded.patch: |
| 33 |
+ Fix building w/ USE=opensync by dropping eautoreconf and using sed instead |
| 34 |
+ of the --as-needed patch (bug #319795). Migrate to EAPI 3. |
| 35 |
|
| 36 |
26 May 2010; Thilo Bangert <bangert@g.o> barry-0.16.ebuild: |
| 37 |
fix build (#319795) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.7 app-pda/barry/barry-0.16.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/barry/barry-0.16.ebuild?rev=1.7&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/barry/barry-0.16.ebuild?rev=1.7&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-pda/barry/barry-0.16.ebuild?r1=1.6&r2=1.7 |
| 46 |
|
| 47 |
Index: barry-0.16.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v |
| 50 |
retrieving revision 1.6 |
| 51 |
retrieving revision 1.7 |
| 52 |
diff -u -r1.6 -r1.7 |
| 53 |
--- barry-0.16.ebuild 26 May 2010 08:53:27 -0000 1.6 |
| 54 |
+++ barry-0.16.ebuild 3 Oct 2010 05:19:55 -0000 1.7 |
| 55 |
@@ -1,11 +1,12 @@ |
| 56 |
# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.6 2010/05/26 08:53:27 bangert Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.7 2010/10/03 05:19:55 dirtyepic Exp $ |
| 60 |
|
| 61 |
-inherit autotools base |
| 62 |
+EAPI="3" |
| 63 |
|
| 64 |
-DESCRIPTION="Allow synchronization, backup, restore, |
| 65 |
-program management, and charging for BlackBerry devices" |
| 66 |
+inherit eutils |
| 67 |
+ |
| 68 |
+DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices" |
| 69 |
HOMEPAGE="http://www.netdirect.ca/software/packages/barry/" |
| 70 |
SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2" |
| 71 |
|
| 72 |
@@ -18,41 +19,41 @@ |
| 73 |
dev-libs/openssl |
| 74 |
dev-util/pkgconfig |
| 75 |
sys-libs/zlib |
| 76 |
- boost? ( >=dev-libs/boost-1.33 ) |
| 77 |
+ boost? ( >=dev-libs/boost-1.33 ) |
| 78 |
doc? ( >=app-doc/doxygen-1.5.6 ) |
| 79 |
gui? ( >=dev-cpp/gtkmm-2.4 |
| 80 |
>=dev-cpp/libglademm-2.4 |
| 81 |
>=dev-cpp/glibmm-2.4 |
| 82 |
>=dev-libs/libtar-1.2.11-r2 ) |
| 83 |
opensync? ( =app-pda/libopensync-0.22* )" |
| 84 |
+ |
| 85 |
RDEPEND="dev-libs/libusb |
| 86 |
sys-libs/zlib |
| 87 |
- boost? ( >=dev-libs/boost-1.33 ) |
| 88 |
+ boost? ( >=dev-libs/boost-1.33 ) |
| 89 |
gui? ( >=dev-cpp/gtkmm-2.4 |
| 90 |
>=dev-cpp/libglademm-2.4 |
| 91 |
>=dev-cpp/glibmm-2.4 ) |
| 92 |
opensync? ( =app-pda/libopensync-0.22* )" |
| 93 |
|
| 94 |
-PATCHES=( |
| 95 |
- "${FILESDIR}/${P}-gcc45.patch" |
| 96 |
- "${FILESDIR}/${P}-asneeded.patch" |
| 97 |
- ) |
| 98 |
- |
| 99 |
-src_unpack(){ |
| 100 |
- base_src_unpack |
| 101 |
- cd "${S}" |
| 102 |
- eautoreconf |
| 103 |
+src_prepare() { |
| 104 |
+ epatch "${FILESDIR}"/${P}-gcc45.patch |
| 105 |
+ sed -i -e '/bdptest_LDADD =/ s:\(.*\):\1 ../src/libbarry.la:' tools/Makefile.in |
| 106 |
+ # Think twice about running eautoreconf here. Upstream seems to like |
| 107 |
+ # patching the generated files directly and the sources don't remotely |
| 108 |
+ # match anymore. See bug #319795. |
| 109 |
} |
| 110 |
|
| 111 |
-src_compile(){ |
| 112 |
+src_configure() { |
| 113 |
econf \ |
| 114 |
$(use_enable boost) \ |
| 115 |
$(use_enable gui) \ |
| 116 |
$(use_with gui libtar /usr) \ |
| 117 |
$(use_with gui libz) \ |
| 118 |
$(use_enable opensync opensync-plugin) |
| 119 |
+} |
| 120 |
|
| 121 |
- emake || die |
| 122 |
+src_compile() { |
| 123 |
+ emake || die "emake failed" |
| 124 |
|
| 125 |
if use doc ; then |
| 126 |
cd "${S}" |
| 127 |
@@ -62,8 +63,9 @@ |
| 128 |
|
| 129 |
src_install() { |
| 130 |
emake DESTDIR="${D}" install || die |
| 131 |
+ dodoc AUTHORS NEWS README || die |
| 132 |
+ |
| 133 |
if use doc; then |
| 134 |
- dodoc AUTHORS NEWS README || die |
| 135 |
dohtml doc/www/doxygen/html/* || die |
| 136 |
fi |
Archives