Fix BerkDB detection code to be compatible with 5.0 wrt #319953 by Diego E. Pettenò.

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

diff --git a/net-p2p/syrep/ChangeLog b/net-p2p/syrep/ChangeLog
index b90bb0060efd3feff53ecc233817cab27fb2c173..0e72bf94cabc669abde9e557117acfc8fdd3def0 100644 (file)
--- a/net-p2p/syrep/ChangeLog
+++ b/net-p2p/syrep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/syrep
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/ChangeLog,v 1.4 2008/01/16 16:06:54 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/ChangeLog,v 1.5 2010/07/14 11:35:38 ssuominen Exp $
+
+  14 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> syrep-0.9.ebuild:
+  Fix BerkDB detection code to be compatible with 5.0 wrt #319953 by Diego
+  E. Pettenò.
 
 *syrep-0.9 (16 Jan 2008)
 

diff --git a/net-p2p/syrep/Manifest b/net-p2p/syrep/Manifest
index 1175241b3fd56ba5ea9046f9cf77be1e13a3c426..fba93d2681fe7b0084822758e6ad26900bc3b69e 100644 (file)
--- a/net-p2p/syrep/Manifest
+++ b/net-p2p/syrep/Manifest
@@ -1,4 +1,4 @@
 DIST syrep-0.9.tar.gz 192317 RMD160 6f5666647688952d7b4eb8f71a94ba969ac4b77c SHA1 a3a45d26ddeb7ac5c28199c4a1eddf56420d0ad5 SHA256 b4072bdd0eef99fdd57a0758e99be8d15917d0ba90cd67e1ffa0832de2568ed2
-EBUILD syrep-0.9.ebuild 1112 RMD160 c2616a2c48a6be79886526d2d5cab8dd9680a708 SHA1 b0b918097ccabf9f383cf20341ce5cd1e7e42670 SHA256 de134785a115f1dde2269a81a8e1ab37863d7f333a32ffe3d99fd2ace815579d
-MISC ChangeLog 811 RMD160 59a16f8f619c2bcec25fed2ebf180ce9c2b76ac2 SHA1 e0c474b5df2ce4832c3706cd480a19ed55ac6d98 SHA256 812cfbe8e39cd89f1f4ff4134a28200c5e2fd875bd0f5acebc4ffe54bf9fe130
+EBUILD syrep-0.9.ebuild 1028 RMD160 b2a2a34270ef852ac12f9970db798a171f889393 SHA1 ca1a857d11ce3daa6ed88737a854133729a24de2 SHA256 be0f9dfc70122170673f92eff5888622951ac65675a9210beac34209765dd442
+MISC ChangeLog 976 RMD160 3306da415c711a79a1f389dbc645ebcdaed88f25 SHA1 13cb431ff36a7d2354578fb39a8d9343a3db589f SHA256 f8eee603627c1abf24058a275ab391d238b1b2930acc0211e2cb0677872f12ed
 MISC metadata.xml 161 RMD160 419e26d02ec2be8f627f0b1b25aeb1698a713ee9 SHA1 dd595b6a10af8706aa3470451dcae25df3c21522 SHA256 7319e52af87b7cdfc644d720749750d9b182db438b40d6dd0ebc60c4e6c51eba

diff --git a/net-p2p/syrep/syrep-0.9.ebuild b/net-p2p/syrep/syrep-0.9.ebuild
index 7424b3d1e93fb9696ad77a9b0a1a4e9dc05a6400..a47fa2bd87189414a5607158599a997dfd467cbd 100644 (file)
--- a/net-p2p/syrep/syrep-0.9.ebuild
+++ b/net-p2p/syrep/syrep-0.9.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/syrep-0.9.ebuild,v 1.1 2008/01/16 16:06:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/syrep-0.9.ebuild,v 1.2 2010/07/14 11:35:38 ssuominen Exp $
 
-inherit eutils autotools
+EAPI=2
+inherit autotools
 
 DESCRIPTION="A p2p generic file repository synchronization tool that may be used to synchronize large file hierarchies bidirectionally by exchanging patch files."
 HOMEPAGE="http://0pointer.de/lennart/projects/syrep/"
@@ -10,34 +11,31 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DEPEND="sys-libs/zlib
        >=sys-libs/db-4.3
        doc? ( www-client/lynx )"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       sed -i -e "s/#if (DB_VERSION_MAJOR != 4).*/#if (DB_VERSION_MAJOR != 4)/" configure.ac
-
+src_prepare() {
+       sed -i \
+               -e "s/#if (DB_VERSION_MAJOR != 4).*/#if (DB_VERSION_MAJOR < 4)/" \
+               configure.ac || die
        eautoreconf
 }
-src_compile() {
+
+src_configure() {
        econf \
                $(use_enable doc lynx) \
                --disable-xmltoman \
                --disable-subversion \
-               --disable-gengetopt \
-               || die "econf failed"
-       emake || die "emake failed"
+               --disable-gengetopt
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       cd "${S}"/doc
+       emake DESTDIR="${D}" install || die
+       cd doc
        dodoc README *.txt
        use doc && dohtml *.html *.css
 }