Bump to EAPI=3 (when needed), add prefix keywords

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

diff --git a/app-text/docbook-xml-simple-dtd/ChangeLog b/app-text/docbook-xml-simple-dtd/ChangeLog
index f7cbd0dc9a5b819a9cec1858b577cb89e92a0762..24fb2d01e8881814b39f2e06ab60f82ed5b980aa 100644 (file)
--- a/app-text/docbook-xml-simple-dtd/ChangeLog
+++ b/app-text/docbook-xml-simple-dtd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/docbook-xml-simple-dtd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/ChangeLog,v 1.51 2010/02/11 14:58:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/ChangeLog,v 1.52 2010/04/05 23:30:55 abcd Exp $
+
+  05 Apr 2010; Jonathan Callen <abcd@gentoo.org>
+  docbook-xml-simple-dtd-1.0-r1.ebuild,
+  docbook-xml-simple-dtd-4.1.2.4-r2.ebuild,
+  docbook-xml-simple-dtd-4.1.2.5-r1.ebuild:
+  Bump to EAPI=3 (when needed), add prefix keywords
 
   11 Feb 2010; Ulrich Mueller <ulm@gentoo.org>
   docbook-xml-simple-dtd-1.0-r1.ebuild,

diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index 2694adc6047ea1776af88843ca2ecaaa0c14d8e2..da38aa0d70e7ac2c77d9b590c199811547b124b3 100644 (file)
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -7,15 +7,15 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 RMD160 bfe67e57ee745734ac074114b
 DIST docbook-simple-1.0.zip 31173 RMD160 69eb251783596d7222baab90c3fe08316823aadc SHA1 595c4824b40aced89359e5a77ed4887903566585 SHA256 412665bd9958a39044d4ab5432c3c786f7f5db51a59905290e4d099983d714ba
 DIST sdb4124.zip 35199 RMD160 32bcdf4d38401f7fdf62aaea587699c03d25ea70 SHA1 3debe639734cfce4cd345ace2b7cdb2bb8eb9b42 SHA256 14aea7b901dd07f7725273fe96456599e226792dc2a02556bef6ab970a57bb56
 DIST simple4125.zip 29839 RMD160 9dbb249dfd89957288c41a3d4e60252327e9be9b SHA1 45ccbd0d9f895621bce6893dc39cbe7c8c2d0a83 SHA256 a3c8dc4961b469447986dc4b6b4d7081450ddb1097ad1d8c82e0d35b335aa1a2
-EBUILD docbook-xml-simple-dtd-1.0-r1.ebuild 945 RMD160 3da1ce2a5ea6097e2a480463dc4fb02871ffdfcf SHA1 b3583cde1acf2b06453925e31d3fd38877a6c4d5 SHA256 6391ffd23bf9fd999c2412814318172f34311c3ba24b38fd92eb7d1ca65411aa
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r2.ebuild 961 RMD160 779935407366112adefcccdd2e2109344638fb73 SHA1 2317be927e170a30d2187ee3419af3c3620cfac8 SHA256 2ae225d781dbd3b531a7e1cf37c1ca1b6c8f2d4ce7093d711825e5e871662c9b
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r1.ebuild 1940 RMD160 2af4e0e9de6bc72addf214660b1322763ac59cff SHA1 c2c5d036b70e093e26d20287c631b9edecd1161a SHA256 d5ae214160eecdba78f24e482fe684498209b7f76b6613ad6fa14fc3db4ba8a7
-MISC ChangeLog 6890 RMD160 d28af0c94fb1fc5a878f53e59fe9e3be2845f567 SHA1 34423f208981fa64457fcead29d8d51d3c4c0192 SHA256 1b3a7d90130c7581d9388da2c8f8edb0dd7cab91bc222c09281dba8efaf92e82
+EBUILD docbook-xml-simple-dtd-1.0-r1.ebuild 996 RMD160 9b41a8be0b577769ad553b3ff42d73099045c1da SHA1 9b009bca1117a33b14d247b429d573dfeee7fcd5 SHA256 b5aa7fd249bd6e91ae394c17abb841bee87d47f611d25dd303759f84d590dc2b
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r2.ebuild 1023 RMD160 e26cc7086c158f7a71e9c92848a610fd52f8bb2b SHA1 a42e3e3bc04cfb6687fa3f4f448d4a6395362054 SHA256 ff668e50505c1ad69b2efc795a686a27facd98d844832f3779d56bd207dcd8ea
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r1.ebuild 2063 RMD160 73f543221a1455e90fbfb10b535d90a7743654cf SHA1 330ebf672d8f467fa368d0240d48c0e2c5f64fa0 SHA256 dc5f9a0eebece6a7fe298197bb9a05d1b6d84159b639a3ae6e958eb773087f2d
+MISC ChangeLog 7121 RMD160 ae750c544f0f88e2dc7ca090d47f22e06025c050 SHA1 7107a6527aaf61281b12fa45da9777c686aab2aa SHA256 bfba7a8a522b1ea35d206e9b50792a4270f5d9879c2130551f72acf79e79f20b
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt0GzAACgkQOeoy/oIi7uz5TgCfdM7lUU37vH5gpi8zYkoLx/oS
-h3wAoLwn70jGU7StyistLo50j04vc/rT
-=x3iJ
+iEYEARECAAYFAku6crkACgkQOypDUo0oQOqCZACgjelGwJN4+ZcLzEQJtwgATS0C
+73IAoJhz3ruwUL3r64SnaKevvlNmT0bT
+=AwsF
 -----END PGP SIGNATURE-----

diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
index 67eeeaa12d8e98d26f08e3ee435f1c94d052b203..e72458f8f65404610b53f76d3b0b3a4642f0355c 100644 (file)
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild,v 1.17 2010/02/11 14:58:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild,v 1.18 2010/04/05 23:30:55 abcd Exp $
 
 inherit sgml-catalog
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="1.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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2"

diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
index 01afb04a041f832fbc8a05da78d26c154bafc96b..4d4eb06570f1eaee46ec6e43abc4923c23301f7f 100644 (file)
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild,v 1.20 2010/02/11 14:58:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild,v 1.21 2010/04/05 23:30:55 abcd Exp $
 
 inherit sgml-catalog
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="as-is"
 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"

diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild
index ab27249c1a6bfe2257d4b328453e8b68596cfef8..7dcea3b8a5f3adb8ea1154863715177525ceff0b 100644 (file)
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild,v 1.2 2010/02/11 14:58:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r1.ebuild,v 1.3 2010/04/05 23:30:55 abcd Exp $
+
+EAPI="3"
 
 DESCRIPTION="Simplified Docbook DTD for XML"
 HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.nwalsh.com/docbook/simple/${PV}/simple4125.zip"
 
 LICENSE="as-is"
 SLOT="4.1.2.5"
-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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41
@@ -18,11 +20,11 @@ RDEPEND=""
 S=${WORKDIR}
 
 xml_catalog_setup() {
-       CATALOG="${ROOT}etc/xml/catalog"
-       XMLTOOL="${ROOT}usr/bin/xmlcatalog"
-       DTDDIR="${ROOT}usr/share/sgml/docbook/${P#docbook-}"
+       CATALOG="${EROOT}etc/xml/catalog"
+       XMLTOOL="${EROOT}usr/bin/xmlcatalog"
+       DTDDIR="${EROOT}usr/share/sgml/docbook/${P#docbook-}"
 
-       [ -x "${XMLTOOL}" ] || return 1
+       [[ -x ${XMLTOOL} ]] || return 1
 
        return 0
 }
@@ -39,21 +41,21 @@ pkg_postinst() {
 
        einfo "Installing docbook-simple-dtd-4.1.2.5 in the global XML catalog"
 
-       $XMLTOOL --noout --add 'public' \
+       "${XMLTOOL}" --noout --add 'public' \
                '-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN' \
-               ${DTDDIR}/sdocbook.dtd $CATALOG
-       $XMLTOOL --noout --add 'rewriteSystem' \
+               "${DTDDIR}/sdocbook.dtd" "${CATALOG}"
+       "${XMLTOOL}" --noout --add 'rewriteSystem' \
                'http://www.oasis-open.org/docbook/xml/simple/4.1.2.5' \
-               ${DTDDIR} $CATALOG
-       $XMLTOOL --noout --add 'rewriteURI' \
+               "${DTDDIR}" "${CATALOG}"
+       "${XMLTOOL}" --noout --add 'rewriteURI' \
                'http://www.oasis-open.org/docbook/xml/simple/4.1.2.5' \
-               ${DTDDIR} $CATALOG
+               "${DTDDIR}" "${CATALOG}"
 }
 
 pkg_postrm() {
        xml_catalog_setup || return
 
-       if [ -d "$DTDDIR" ]; then
+       if [[ -d ${DTDDIR} ]]; then
                einfo "The simple-dtd-4.1.2.5 data directory still exists."
                einfo "No entries will be removed from the XML catalog."
                return
@@ -61,8 +63,8 @@ pkg_postrm() {
 
        einfo "Removing docbook-simple-dtd-4.1.2.5 from the global XML catalog"
 
-       $XMLTOOL --noout --del \
-               '-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN' $CATALOG
-       $XMLTOOL --noout --del \
-               'http://www.oasis-open.org/docbook/xml/simple/4.1.2.5' $CATALOG
+       "${XMLTOOL}" --noout --del \
+               '-//OASIS//DTD Simplified DocBook XML V4.1.2.5//EN' "${CATALOG}"
+       "${XMLTOOL}" --noout --del \
+               'http://www.oasis-open.org/docbook/xml/simple/4.1.2.5' "${CATALOG}"
 }