diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2010-05-11 22:58:10 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2010-05-11 22:58:10 +0000 |
| commit | 52c0f79de704a6d71a294fee32d5550c3e038a00 (patch) | |
| tree | a82c5b5714229d87a9cf786b8880cfff6b0ec271 /app-editors | |
| parent | stable ppc64, bug 318809 (diff) | |
| download | historical-52c0f79de704a6d71a294fee32d5550c3e038a00.tar.gz historical-52c0f79de704a6d71a294fee32d5550c3e038a00.tar.bz2 historical-52c0f79de704a6d71a294fee32d5550c3e038a00.zip | |
Allow building with DB 4.8.30
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/nvi/ChangeLog | 5 | ||||
| -rw-r--r-- | app-editors/nvi/Manifest | 12 | ||||
| -rw-r--r-- | app-editors/nvi/nvi-1.81.6-r3.ebuild | 24 |
3 files changed, 29 insertions, 12 deletions
diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog index 27b197f3c13b..d4c0b9b77e25 100644 --- a/app-editors/nvi/ChangeLog +++ b/app-editors/nvi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-editors/nvi # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.75 2010/01/10 18:34:15 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.76 2010/05/11 22:58:10 truedfx Exp $ + + 11 May 2010; Harald van Dijk <truedfx@gentoo.org> nvi-1.81.6-r3.ebuild: + Allow building with DB 4.8.30 10 Jan 2010; Harald van Dijk <truedfx@gentoo.org> nvi-1.81.6-r2.ebuild, nvi-1.81.6-r3.ebuild: diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest index 139c2dc2fd37..0d1b52816c89 100644 --- a/app-editors/nvi/Manifest +++ b/app-editors/nvi/Manifest @@ -7,13 +7,13 @@ AUX nvi-1.81.6-perl-as-needed.patch 2811 RMD160 f55e43fb03beac7a0021ed7ff1d04ba3 AUX nvi-1.81.6-perl-shortnames.patch 388 RMD160 d803b6490ec6e539d6057913eac55ef6a5ae76d3 SHA1 2e11f167c7b3c4022593067c23b1d3f4d907ade2 SHA256 95655b83c8d5b0feaa13bffa51951e95765884d3f85d231b979b1782cff9cf65 DIST nvi-1.81.6.tar.bz2 1758309 RMD160 0db8568bea96392d9a027044177c60317c8ade36 SHA1 d3445ed69166102735335a2ff60d092d9a9143c6 SHA256 3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59 EBUILD nvi-1.81.6-r2.ebuild 1609 RMD160 9022f9bbd78b264fe83548c4509c246870837ca2 SHA1 6bff34ceec234531b79dd0e2818338d058724872 SHA256 6308e27bd53de7e2ae63554c024ad98bd8c83f03af607551639325bb702bc4dc -EBUILD nvi-1.81.6-r3.ebuild 2011 RMD160 1b5f1c62209573ad5b7da149691b190cb477b567 SHA1 60bb3513cefe062a53abbe1e34523689cf38bafa SHA256 99698afd4bf651842887d72bfb40758648de6a5ecbc4d254898617aef0cb9361 -MISC ChangeLog 10713 RMD160 63ed8eb2741de07b0af7fc38c77c4ecc47dc467b SHA1 b5fa0a51f0baa683d77a9fffd59fbb4e36a9bc20 SHA256 e9cb6b2c69ab8a8c7c2b9cbce3fe9763914990b78cce52dc7e2233ba9507a06e +EBUILD nvi-1.81.6-r3.ebuild 2271 RMD160 5323f7a1716a98b3c54f3367c90b2b58ef4bbdad SHA1 122880449254518abde7154a356663b4c6e3fd14 SHA256 a121f7a70d2308ac8b691f976481a3f3c4aa593544a74e4e3b1666bfab7e925c +MISC ChangeLog 10820 RMD160 ee192160cde94ea4dbc5e7fae898ec79a5ed8118 SHA1 6e4cedc386c5999cbba84895fd64f05c77b1c926 SHA256 4cd98135dc0bc33e21b10aa1ae577882b41aac6ee6e6359a6e5aa70cb670e155 MISC metadata.xml 250 RMD160 61af8ec7e1bf9941d107eff4cc6a639874a6f198 SHA1 7ea68a3bd071637e4a49b61b2f7e35f3277545ef SHA256 aec181c304bce77cce8f1dc110e0203bc06b7c524ab40b1aac19a6f72aefdfde -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAktKHfIACgkQwnQyISwouHxNLwCgtUXOCm3cfgr3uakSM+3/YZbK -fS4AoL+4m/6+Bhb6hMty17P0cfIpXWCO -=RNwb +iEYEARECAAYFAkvp4RgACgkQwnQyISwouHw0NQCcCIno0xcMBTMcKCiN0pKOmyIE +WekAn0u9zA1iQtQzkgHRMMR3N3YHH4J3 +=+ERa -----END PGP SIGNATURE----- diff --git a/app-editors/nvi/nvi-1.81.6-r3.ebuild b/app-editors/nvi/nvi-1.81.6-r3.ebuild index 06d8fa72c717..ba8d0e7be5dc 100644 --- a/app-editors/nvi/nvi-1.81.6-r3.ebuild +++ b/app-editors/nvi/nvi-1.81.6-r3.ebuild @@ -1,10 +1,24 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.4 2010/01/10 18:34:15 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.5 2010/05/11 22:58:10 truedfx Exp $ + +EAPI=1 inherit autotools db-use eutils flag-o-matic -DBVERS="4.7 4.6 4.5 4.4 4.3 4.2" +DBVERS="4.8.30 4.7 4.6 4.5 4.4 4.3 4.2" +DBSLOTS= +DBDEPENDS= +for DBVER in ${DBVERS} +do + if [[ ${DBVER} = *.*.* ]]; then + DBSLOTS="${DBSLOTS} ${DBVER%.*}" + DBDEPENDS="${DBDEPENDS} >=sys-libs/db-${DBVER}:${DBVER%.*}" + else + DBSLOTS="${DBSLOTS} ${DBVER}" + DBDEPENDS="${DBDEPENDS} sys-libs/db:${DBVER}" + fi +done DESCRIPTION="Vi clone" HOMEPAGE="http://www.bostic.com/vi/" @@ -15,7 +29,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="perl tcl unicode" -DEPEND="|| ( $(printf "=sys-libs/db-%s*\n" ${DBVERS}) ) +DEPEND="|| ( ${DBDEPENDS} ) perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) )" RDEPEND="${DEPEND} @@ -40,8 +54,8 @@ src_unpack() { epatch "${FILESDIR}"/${P}-perl-shortnames.patch cd ../dist || die chmod +x findconfig || die - append-flags -I"$(db_includedir ${DBVERS})" - sed -i -e "s@-ldb@-l$(db_libname ${DBVERS})@" configure.in || die + append-flags -I"$(db_includedir ${DBSLOTS})" + sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.in || die rm -f configure || die eautoreconf -Im4 } |