Revbump for EAPI bump, add prefix keywords

Package-Manager: portage--svn/cvs/Linux i686

5 files changed, 130 insertions, 33 deletions

diff --git a/dev-util/cvs/ChangeLog b/dev-util/cvs/ChangeLog
index 1ae934e04c5e..5b063fa96f7a 100644
--- a/dev-util/cvs/ChangeLog
+++ b/dev-util/cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cvs
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.135 2009/04/26 19:35:49 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/ChangeLog,v 1.136 2010/02/21 03:06:44 abcd Exp $
+
+*cvs-1.12.12-r7 (21 Feb 2010)
+
+  21 Feb 2010; Jonathan Callen <abcd@gentoo.org> +cvs-1.12.12-r7.ebuild,
+  cvs-1.12.13-r1.ebuild, cvs-1.12.13.1.ebuild:
+  Revbump for EAPI bump, add prefix keywords
 
   26 Apr 2009; Brent Baude <ranger@gentoo.org> cvs-1.12.12-r6.ebuild:
   stable ppc, bug 265780
diff --git a/dev-util/cvs/Manifest b/dev-util/cvs/Manifest
index 43eab1384d7d..6dbe165e36a8 100644
--- a/dev-util/cvs/Manifest
+++ b/dev-util/cvs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cvs-1.12.12-block-requests.patch 4006 RMD160 47be05434e53c25fc6dd1fa6848d25d155dc307a SHA1 a4e77d76457a3047c19945d53f3b2aca572d1da4 SHA256 70bbf745815d1e01582329160a10f5cdd9c11051e4e62d331686dd5124e01294
 AUX cvs-1.12.12-cvs-custom.c 1735 RMD160 c4c1dea5b3656061a2eb0678acaa95c1b58b2e87 SHA1 409184599eb9b311a91066d75b2833ee455bbd4d SHA256 bd288a9484c4c26569a44e71f0935cf310e4b02e25e7e9ba564c9fc3f5121054
 AUX cvs-1.12.12-cvs-gnulib-vasnprintf.patch 1092 RMD160 1ec01dbfca6cbc8b933f1331b1e020430494273d SHA1 9edfd35bff01a05a9b1936f33f4645a57fb818d7 SHA256 f38e6bbb0fd8b783b654ac775183a1cb24e3987698fdbd706a8d5fa59a45f945
@@ -38,7 +41,15 @@ EBUILD cvs-1.12.12-r3.ebuild 2083 RMD160 fa07d30926b1988612357c5b21e4fc4fa7e603d
 EBUILD cvs-1.12.12-r4.ebuild 2390 RMD160 8cf24960136d2aac5b36abccc887ca63f7b05d56 SHA1 9ec607fdc5bc8156d96e036f76d192700b113756 SHA256 dcd0d28d66aa4218cee6d65554f97e8bb7aac214683cd5de91ee0af3d07b2f6a
 EBUILD cvs-1.12.12-r5.ebuild 2422 RMD160 06ea1afa9a4de041d5f11ed5390a1bf8f9d97c98 SHA1 17d8b3c3787a447e2a4a9a52917c3cfea40f2105 SHA256 0c73cede054615273de7c243273bffb6be6bdba51f0290f82564c1aacd7632e6
 EBUILD cvs-1.12.12-r6.ebuild 2464 RMD160 5c11d1fc110086def5eba42d8cd67ce6eed2e84c SHA1 3fbe0e6644ce71fb04b6fea0c5a2ef60fd9ed21f SHA256 da5ea464d88243146bcf17dba48f92f608b361db73ec21d74b56c8bc8ad45fe4
-EBUILD cvs-1.12.13-r1.ebuild 3982 RMD160 83a7c84eb1ddab91ac81fed1773e2e955ffbab97 SHA1 5252e96f5742b077aeeee6e4e91b8b92c682e30e SHA256 cc9af957ad66fe8e08ef329d28b24d75f58ee6a133c6926cf203fc5e9c1d1806
-EBUILD cvs-1.12.13.1.ebuild 4670 RMD160 420a61a5bc6b14da8eb121fab1b4cb5f44f04e8e SHA1 778a0ef935dc47a45fa75ce4887823fc3f127a82 SHA256 59ecb4b3933aa5b1d3274ffe1e2d72c1e76252d0f7a09f9fc5bb5abce2064f08
-MISC ChangeLog 18060 RMD160 be9187363033de2d42d24a8c2feff8d03f0fe5f3 SHA1 eb94d38381d68684d5d64cbe6aebd5868927d4a8 SHA256 57fd564039f1a6c137698aa76f38bcf5fcc294cae0a36744e43186eba4e160f2
+EBUILD cvs-1.12.12-r7.ebuild 2512 RMD160 caba581c87cc99852007d36d71dc6d8327274065 SHA1 ee5edf971e91a6327f7de9dae9e96ccdc6c2eae3 SHA256 16730d913c09d2d63343bf304e80a95c61ca556f6765b3bed6948bb47ddc8a6e
+EBUILD cvs-1.12.13-r1.ebuild 4003 RMD160 5e2bf9ff59a53be71ea3ce5f67a1d0601313883b SHA1 42a49a2ca0eddb66dd6f80e2b3de61fdddd957d9 SHA256 5fb15273826e7a9a320eefbcc7e8e70d5ca712e11987d6332a2b1cd1eb397d64
+EBUILD cvs-1.12.13.1.ebuild 4630 RMD160 f7cb830193fa9e4aa9c3020ccee5fc7c2efbbb6e SHA1 3b0581dc8f547762bd88c518883cc6fdef6b35bf SHA256 a896eaf50b85aa3220773680e9a70b2e567fb2a9fc25673e31c81658f9949cb7
+MISC ChangeLog 18255 RMD160 935ada1be09535caafaaf11f4ed66c1ec70b9c6b SHA1 74d5f8026957f8982b7a456eb96795770977acaa SHA256 173fc2a81ebc4457dc1f1b8debe412c23cc014a90c1a1519259a1206351c4b28
 MISC metadata.xml 234 RMD160 e17a8f89518ebdd332c220104e56f649096be1da SHA1 472e62beb27cdd753a0454194630c916f0600e0b SHA256 ce7beba20d6099be006550fb74bb9e74628a9d6967c7ceb096ab99959df47a02
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuAo08ACgkQOypDUo0oQOrqnACfSldMLQ1+prQ/RYO3YWrBxcZS
+psYAoMaB2SdQa5mHn/J6asoB9SwykHGq
+=2Iti
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cvs/cvs-1.12.12-r7.ebuild b/dev-util/cvs/cvs-1.12.12-r7.ebuild
new file mode 100644
index 000000000000..add52a4171b8
--- /dev/null
+++ b/dev-util/cvs/cvs-1.12.12-r7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.12-r7.ebuild,v 1.1 2010/02/21 03:06:44 abcd Exp $
+
+EAPI=3
+
+inherit eutils pam
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="http://www.nongnu.org/cvs/"
+
+SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="crypt doc kerberos nls pam server"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack cederqvist-${PV}.html.tar.bz2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	epatch "${FILESDIR}"/${P}-openat.patch
+	epatch "${FILESDIR}"/${P}-block-requests.patch
+	epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+	epatch "${FILESDIR}"/${P}-install-sh.patch
+	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
+}
+
+src_configure() {
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=/tmp \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
+
+	dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
+		MINOR* NEWS PROJECTS README* TESTS TODO
+
+	# Not installed into emacs site-lisp because it clobbers the normal C
+	# indentations.
+	dodoc cvs-format.el || die "dodoc failed"
+
+	use server && newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
+
+	if use doc; then
+		dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
+		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
+		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
+		dohtml -r cederqvist-${PV}.html/*
+		dosym cvs.html /usr/share/doc/${PF}/html/index.html
+	fi
+
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+}
+
+src_test() {
+	einfo "FEATURES=\"maketest\" has been disabled for dev-util/cvs"
+}
diff --git a/dev-util/cvs/cvs-1.12.13-r1.ebuild b/dev-util/cvs/cvs-1.12.13-r1.ebuild
index b4bcd1b07a89..56cd77a1acab 100644
--- a/dev-util/cvs/cvs-1.12.13-r1.ebuild
+++ b/dev-util/cvs/cvs-1.12.13-r1.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-util/cvs/cvs-1.12.13-r1.ebuild,v 1.6 2008/06/16 18:11:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13-r1.ebuild,v 1.7 2010/02/21 03:06:44 abcd Exp $
+
+EAPI=3
 
 inherit eutils pam
 
@@ -14,7 +16,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc emacs kerberos nls pam server"
 
@@ -25,10 +27,12 @@ DEPEND=">=sys-libs/zlib-1.1.4
 src_unpack() {
 	unpack ${P}.tar.bz2
 	use doc && unpack cederqvist-${PV}.html.tar.bz2
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
 	epatch "${FILESDIR}"/${P}-openat.patch
-	EPATCH_OPTS="-p0 -d ${S}" epatch "${FILESDIR}"/${P}-zlib.patch
-	cd "${S}"
+	epatch "${FILESDIR}"/${P}-zlib.patch
 	epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
 	# this testcase was not updated
 	#sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
@@ -38,7 +42,7 @@ src_unpack() {
 	  "${S}"/src/sanity.sh
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	# the tests need the server and proxy
 	if has test $FEATURES; then
@@ -54,10 +58,7 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_enable pam) \
 		$(use_enable server) \
-		$(use_enable server proxy) \
-		${myconf} \
-		|| die
-	emake || die "emake failed"
+		$(use_enable server proxy)
 }
 
 src_install() {
@@ -81,8 +82,7 @@ src_install() {
 		dodoc "${DISTDIR}"/cederqvist-${PV}.ps
 		tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
 		dohtml -r cederqvist-${PV}.html/*
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
+		dosym cvs.html /usr/share/doc/${PF}/html/index.html
 	fi
 
 	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
diff --git a/dev-util/cvs/cvs-1.12.13.1.ebuild b/dev-util/cvs/cvs-1.12.13.1.ebuild
index 71a48eb9e281..00644ff6f07a 100644
--- a/dev-util/cvs/cvs-1.12.13.1.ebuild
+++ b/dev-util/cvs/cvs-1.12.13.1.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-util/cvs/cvs-1.12.13.1.ebuild,v 1.5 2008/06/16 18:14:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cvs/cvs-1.12.13.1.ebuild,v 1.6 2010/02/21 03:06:44 abcd Exp $
+
+EAPI=3
 
 inherit eutils pam versionator
 
@@ -22,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt doc kerberos nls pam server"
 
@@ -33,15 +35,16 @@ DEPEND=">=sys-libs/zlib-1.1.4
 src_unpack() {
 	unpack ${P}.tar.bz2
 	use doc && unpack cederqvist-${DOC_PV}.html.tar.bz2
+}
 
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.12.12-cvsbug-tmpfix.patch
+	epatch "${FILESDIR}"/${PN}-1.12.12-install-sh.patch
+	epatch "${FILESDIR}"/${PN}-1.12.13.1-block-requests.patch
 	# Applied by upstream:
-	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-1.12.13-openat.patch
-	#EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-1.12.13-zlib.patch
+	#epatch "${FILESDIR}"/${PN}-1.12.13-openat.patch
+	#epatch "${FILESDIR}"/${PN}-1.12.13-zlib.patch
 
-	cd "${S}"
 	# this testcase was not updated
 	#sed -i.orig -e '/unrecognized keyword.*BogusOption/s,98,73,g' \
 	#  ${S}/src/sanity.sh
@@ -53,7 +56,7 @@ src_unpack() {
 	elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	# the tests need the server and proxy
 	if has test $FEATURES; then
@@ -70,9 +73,7 @@ src_compile() {
 		$(use_enable pam) \
 		$(use_enable server) \
 		$(use_enable server proxy) \
-		${myconf} \
-		|| die
-	emake || die "emake failed"
+		${myconf}
 }
 
 src_install() {
@@ -96,8 +97,7 @@ src_install() {
 		dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.pdf
 		dodoc "${DISTDIR}"/cederqvist-${DOC_PV}.ps
 		dohtml -r "${WORKDIR}"/cederqvist-${DOC_PV}.html/
-		cd "${D}"/usr/share/doc/${PF}/html/
-		ln -s cvs.html index.html
+		dosym cvs.html /usr/share/doc/${PF}/html/index.html
 	fi
 
 	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs