Bump to EAPI=3, add prefix keywords

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

3 files changed, 27 insertions, 20 deletions

diff --git a/app-text/asciidoc/ChangeLog b/app-text/asciidoc/ChangeLog
index 562a4754802b..04e301cb8e9c 100644
--- a/app-text/asciidoc/ChangeLog
+++ b/app-text/asciidoc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/asciidoc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.51 2009/12/04 16:55:12 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/ChangeLog,v 1.52 2010/04/05 23:16:25 abcd Exp $
+
+  05 Apr 2010; Jonathan Callen <abcd@gentoo.org> asciidoc-8.5.1.ebuild:
+  Bump to EAPI=3, add prefix keywords
 
 *asciidoc-8.5.1 (04 Dec 2009)
 
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 61a5acc74d1b..026d02c5efae 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST asciidoc-8.2.6.tar.gz 739790 RMD160 c07d2eaa04d16275c44756236023c0789cf54310 SHA1 cce98ed670c462a3a007b03b6f92d2108c5bc405 SHA256 5e9c966cfcb9d08487da625b41ed5e007eedb2d1abbb996dd6f78f2c5bde08dc
 DIST asciidoc-8.5.1.tar.gz 1242674 RMD160 cc24f6befc53b493e18f2dc186b4849302c176b3 SHA1 e8c043d9a10ada9c38cb6725e5c00895f474ae5a SHA256 ccb02db04e6e6eff2149435516e88557ca30c85bc4467420f40c895e25f17a20
 EBUILD asciidoc-8.2.6.ebuild 1637 RMD160 679248508c7be257f43cc382a012ce3c4af33a61 SHA1 2a2b77520e6891000ef964ee26d09e962729d8c0 SHA256 edbb13f2c919c85faa2b426881d8f0fe7fad7fd9b314c3dd0efe1824b646c5d6
-EBUILD asciidoc-8.5.1.ebuild 1691 RMD160 2c55577af1ec1ec6339fcb3e55e38e6e91d128b8 SHA1 9f0239721a572c0c07e00e97fc6b5d7697b02e48 SHA256 ce41abc59eaab607bdf12c7ba3ee7faf7db7a6290fdf97844ddf31506fa6068a
-MISC ChangeLog 7397 RMD160 510aba31f01d0dace30edb704f25aed4136fe56d SHA1 ed71255067ea5c61398c8abf4cfca00d58034777 SHA256 37a09a47857831029516c6894533344c68b6e09768986bc453fdd4ee03fa2170
+EBUILD asciidoc-8.5.1.ebuild 1903 RMD160 3440499dd98ab0d8c66c518c95062389f19d70b1 SHA1 2239d78088c8567e43fe4a657f8b947233607e33 SHA256 308f22c1590e568d00e256ce585fa39f4becc882fde1704b29627a7387fff194
+MISC ChangeLog 7503 RMD160 b92ec85113c76c360455fc09fd13a487752f6561 SHA1 f37da6dedd038ba82011a6bc50880ef0543cebd7 SHA256 91c3862bbc0f1c6f075648b174647fcfdb6ffaa5a1b1bdf1bd6b30ab18ce561a
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksZPusACgkQAiZjviIA2Xh4ygCcCSaH6HvGhgz2MmxzJSf5/tJP
-ly8AoLAHi/di9zm7d8f3XajF/VwKyrKD
-=jkwe
+iEYEARECAAYFAku6b1IACgkQOypDUo0oQOrOyQCeMWd835JahdD560461xnmWgao
+2rIAmwdqtes92I1kJRN7M338EcPqmbtj
+=0cmP
 -----END PGP SIGNATURE-----
diff --git a/app-text/asciidoc/asciidoc-8.5.1.ebuild b/app-text/asciidoc/asciidoc-8.5.1.ebuild
index 7262c20b5439..2c83e81b68c9 100644
--- a/app-text/asciidoc/asciidoc-8.5.1.ebuild
+++ b/app-text/asciidoc/asciidoc-8.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.5.1.ebuild,v 1.1 2009/12/04 16:55:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/asciidoc/asciidoc-8.5.1.ebuild,v 1.2 2010/04/05 23:16:25 abcd Exp $
 
-EAPI="2"
+EAPI="3"
 
 DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
 HOMEPAGE="http://www.methods.co.nz/asciidoc/"
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples vim-syntax"
 
-RDEPEND=">=virtual/python-2.4
-		>=app-text/docbook-xsl-stylesheets-1.75
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
+		=dev-lang/python-2*
 		dev-libs/libxslt
 		media-gfx/graphviz
 		app-text/docbook-xml-dtd:4.5
@@ -26,14 +26,18 @@ src_prepare() {
 		sed -i -e '/^install/s/install-vim//' Makefile.in
 	else
 		sed -i\
-			-e '/^vimdir/s/@sysconfdir@\/vim/\/usr\/share\/vim\/vimfiles/' \
-			-e 's/\/etc\/vim//' \
+			-e "/^vimdir/s:@sysconfdir@/vim:${EPREFIX}/usr/share/vim/vimfiles:" \
+			-e 's:/etc/vim::' \
 			Makefile.in || die
 	fi
+
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
 }
 
 src_configure() {
-	econf --sysconfdir=/usr/share || die
+	econf --sysconfdir="${EPREFIX}"/usr/share
 }
 
 src_install() {
@@ -49,12 +53,12 @@ src_install() {
 
 		insinto /usr/share/doc/${PF}
 		doins -r examples || die
-		dosym /usr/share/asciidoc/images /usr/share/doc/${PF}/examples || die
+		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples || die
 	fi
 
 	dohtml doc/*.html || die
-	dosym /usr/share/asciidoc/images /usr/share/doc/${PF}/html || die
-	dosym /usr/share/asciidoc/stylesheets/docbook-xsl.css /usr/share/doc/${PF}/html || die
+	dosym ../../../asciidoc/images /usr/share/doc/${PF}/html || die
+	dosym ../../../asciidoc/stylesheets/docbook-xsl.css /usr/share/doc/${PF}/html || die
 
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt || die
 }