From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-245926-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1OByP4-00068d-2C
for garchives@archives.gentoo.org; Tue, 11 May 2010 22:58:18 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6D97AE08ED;
Tue, 11 May 2010 22:58:12 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 33650E08ED
for <gentoo-commits@lists.gentoo.org>; Tue, 11 May 2010 22:58:12 +0000 (UTC)
Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTP id B20C41B4042
for <gentoo-commits@lists.gentoo.org>; Tue, 11 May 2010 22:58:11 +0000 (UTC)
Received: by corvid.gentoo.org (Postfix, from userid 944)
id B626C2C4F8; Tue, 11 May 2010 22:58:10 +0000 (UTC)
From: "Harald van Dijk (truedfx)" <truedfx@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, truedfx@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/nvi: ChangeLog nvi-1.81.6-r3.ebuild
X-VCS-Repository: gentoo-x86
X-VCS-Files: ChangeLog nvi-1.81.6-r3.ebuild
X-VCS-Directories: app-editors/nvi
X-VCS-Committer: truedfx
X-VCS-Committer-Name: Harald van Dijk
Content-Type: text/plain; charset=utf8
Message-Id: <20100511225810.B626C2C4F8@corvid.gentoo.org>
Date: Tue, 11 May 2010 22:58:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: bd25ee8d-bf38-49c0-ab8c-9df9e7379e60
X-Archives-Hash: cdb825ea334ca353e79081621564b728
truedfx 10/05/11 22:58:10
Modified: ChangeLog nvi-1.81.6-r3.ebuild
Log:
Allow building with DB 4.8.30
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.76 app-editors/nvi/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/Ch=
angeLog?rev=3D1.76&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/Ch=
angeLog?rev=3D1.76&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/Ch=
angeLog?r1=3D1.75&r2=3D1.76
Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 10 Jan 2010 18:34:15 -0000 1.75
+++ ChangeLog 11 May 2010 22:58:10 -0000 1.76
@@ -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 D=C4=B3k <truedfx@gentoo.org> nvi-1.81.6-r3.eb=
uild:
+ Allow building with DB 4.8.30
=20
10 Jan 2010; Harald van D=C4=B3k <truedfx@gentoo.org> nvi-1.81.6-r2.eb=
uild,
nvi-1.81.6-r3.ebuild:
1.5 app-editors/nvi/nvi-1.81.6-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/nv=
i-1.81.6-r3.ebuild?rev=3D1.5&view=3Dmarkup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/nv=
i-1.81.6-r3.ebuild?rev=3D1.5&content-type=3Dtext/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nvi/nv=
i-1.81.6-r3.ebuild?r1=3D1.4&r2=3D1.5
Index: nvi-1.81.6-r3.ebuild
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvi-1.81.6-r3.ebuild 10 Jan 2010 18:34:15 -0000 1.4
+++ nvi-1.81.6-r3.ebuild 11 May 2010 22:58:10 -0000 1.5
@@ -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=3D1
=20
inherit autotools db-use eutils flag-o-matic
=20
-DBVERS=3D"4.7 4.6 4.5 4.4 4.3 4.2"
+DBVERS=3D"4.8.30 4.7 4.6 4.5 4.4 4.3 4.2"
+DBSLOTS=3D
+DBDEPENDS=3D
+for DBVER in ${DBVERS}
+do
+ if [[ ${DBVER} =3D *.*.* ]]; then
+ DBSLOTS=3D"${DBSLOTS} ${DBVER%.*}"
+ DBDEPENDS=3D"${DBDEPENDS} >=3Dsys-libs/db-${DBVER}:${DBVER%.*}"
+ else
+ DBSLOTS=3D"${DBSLOTS} ${DBVER}"
+ DBDEPENDS=3D"${DBDEPENDS} sys-libs/db:${DBVER}"
+ fi
+done
=20
DESCRIPTION=3D"Vi clone"
HOMEPAGE=3D"http://www.bostic.com/vi/"
@@ -15,7 +29,7 @@
KEYWORDS=3D"~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=3D"perl tcl unicode"
=20
-DEPEND=3D"|| ( $(printf "=3Dsys-libs/db-%s*\n" ${DBVERS}) )
+DEPEND=3D"|| ( ${DBDEPENDS} )
perl? ( dev-lang/perl )
tcl? ( !unicode? ( >=3Ddev-lang/tcl-8.5 ) )"
RDEPEND=3D"${DEPEND}
@@ -40,8 +54,8 @@
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
}