Clean up ebuilds -- make them uniform style, settings, and check install with "die".

(Portage version: 2.2_rc60/cvs/Linux x86_64)

6 files changed, 47 insertions, 49 deletions

diff --git a/app-text/docbook-xml-dtd/ChangeLog b/app-text/docbook-xml-dtd/ChangeLog
index 65cdbc2cf354..8fe4c38c7922 100644
--- a/app-text/docbook-xml-dtd/ChangeLog
+++ b/app-text/docbook-xml-dtd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/docbook-xml-dtd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.70 2009/08/23 16:04:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/ChangeLog,v 1.71 2009/12/21 03:06:37 vapier Exp $
+
+  21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  docbook-xml-dtd-4.1.2-r6.ebuild, docbook-xml-dtd-4.2-r2.ebuild,
+  docbook-xml-dtd-4.3-r1.ebuild, docbook-xml-dtd-4.4-r1.ebuild,
+  docbook-xml-dtd-4.5.ebuild:
+  Clean up ebuilds -- make them uniform style, settings, and check install
+  with "die".
 
   23 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   docbook-xml-dtd-4.1.2-r6.ebuild, docbook-xml-dtd-4.2-r1.ebuild,
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
index 45baa82ca4d0..c069de08d93f 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild,v 1.18 2009/08/23 16:04:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild,v 1.19 2009/12/21 03:06:37 vapier Exp $
 
 inherit sgml-catalog
 
 MY_P="docbkx412"
 DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="http://www.oasis-open.org/docbook/xml/${PV}/${MY_P}.zip"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
-SLOT="4.1.2"
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
@@ -25,9 +25,9 @@ sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
 	unpack ${A}
 
 	# Prepend OVERRIDE directive
@@ -35,14 +35,12 @@ src_unpack() {
 }
 
 src_install() {
-
 	keepdir /etc/xml
 
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.dtd *.mod
-	doins docbook.cat
+	doins *.cat *.dtd *.mod || die
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent
+	doins ent/*.ent || die
 
 	dodoc ChangeLog *.txt
 }
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
index 103128749ec5..8a3929cdf173 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild,v 1.12 2009/08/09 16:16:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild,v 1.13 2009/12/21 03:06:37 vapier Exp $
 
 inherit sgml-catalog
 
-MY_P="docbook-xml-4.2"
+MY_P=${P/-dtd/}
 DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="http://www.oasis-open.org/docbook/xml/${PV}/${MY_P}.zip"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
-SLOT="4.2"
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
@@ -25,9 +25,9 @@ sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
 	unpack ${A}
 
 	# Prepend OVERRIDE directive
@@ -35,17 +35,14 @@ src_unpack() {
 }
 
 src_install() {
-
 	keepdir /etc/xml
 
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.dtd *.mod
-	doins docbook.cat
+	doins *.cat *.dtd *.mod || die
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent
+	doins ent/*.ent || die
 
 	dodoc ChangeLog README
-
 }
 
 pkg_postinst() {
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
index 5fda49c58d88..b271d7d95cfe 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild,v 1.12 2009/08/09 16:16:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild,v 1.13 2009/12/21 03:06:37 vapier Exp $
 
 inherit sgml-catalog
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.docbook.org/"
 SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
-SLOT="4.3"
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
@@ -25,9 +25,9 @@ sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
 	unpack ${A}
 
 	# Prepend OVERRIDE directive
@@ -35,17 +35,14 @@ src_unpack() {
 }
 
 src_install() {
-
 	keepdir /etc/xml
 
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.dtd *.mod
-	doins docbook.cat
+	doins *.cat *.dtd *.mod || die
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent
+	doins ent/*.ent || die
 
 	dodoc ChangeLog README
-
 }
 
 pkg_postinst() {
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
index b2fd83dd474a..1b1ea5081992 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild,v 1.18 2009/08/23 16:04:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild,v 1.19 2009/12/21 03:06:37 vapier Exp $
 
 inherit sgml-catalog
 
 MY_P=${P/-dtd/}
 DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/xml/"
+HOMEPAGE="http://www.docbook.org/"
 SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
-SLOT="4.4"
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
@@ -25,9 +25,9 @@ sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
 	unpack ${A}
 
 	# Prepend OVERRIDE directive
@@ -38,12 +38,11 @@ src_install() {
 	keepdir /etc/xml
 
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.dtd *.mod
-	doins docbook.cat
+	doins *.cat *.dtd *.mod || die
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent
+	doins ent/*.ent || die
 
-	mv ent/README README.ent
+	cp ent/README README.ent
 	dodoc ChangeLog README*
 }
 
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
index 1aeec144ce99..b3f8270f3520 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild,v 1.9 2009/08/03 06:20:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild,v 1.10 2009/12/21 03:06:37 vapier Exp $
 
 inherit sgml-catalog
 
 MY_P=${P/-dtd/}
 DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.docbook.org/xml/"
+HOMEPAGE="http://www.docbook.org/"
 SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="X11"
-SLOT="4.5"
+SLOT="${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
@@ -25,9 +25,9 @@ sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
 
+S=${WORKDIR}
+
 src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
 	unpack ${A}
 
 	# Prepend OVERRIDE directive
@@ -38,11 +38,11 @@ src_install() {
 	keepdir /etc/xml
 
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
-	doins *.cat *.dtd *.mod *.xml
+	doins *.cat *.dtd *.mod *.xml || die
 	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
-	doins ent/*.ent
+	doins ent/*.ent || die
 
-	mv ent/README README.ent
+	cp ent/README README.ent
 	dodoc ChangeLog README*
 }