gentoo resync : 16.04.2018

9 files changed, 56 insertions, 56 deletions

diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 97261c261c17..ac6da68b86b8 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1038 BLAKE2B bea382cc74d450842b340b2f4131f8454fe3cb023b0e57b709038d730a0853fb68f8cedf809a0ef52efa31467c3cf3363019a465d04fd90ccc29ab8cfa9b6f9a SHA512 f6f9c1183fe68817185786c665a0e3d0acdd82c56a1f2bb11e0eb411cf070a7583f66faf25bdf0c88f3822d5777e710430084fa5aa9d8db503066c0b89d1040a
-EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1038 BLAKE2B 587dd834b106b4c66a1981d236e3e9a4d07102f1d995ca8e521c433decb3d0ec3467d53ac50853706162b090d472f0957251fca9483ff6a429676f52d8898957 SHA512 193d0561043034ec1328133724a6a9e233e35623364aef45a58807f383593bed33e9feb3289a4631b2a4d8e69fc508ebcf9f95b64ca6f5a073eae415b468c1bc
-EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1038 BLAKE2B e570f274d56bb1f6011695e8f17e240dea09385f656e642d6f4fbfa883cd081f044a7a2602099b391a2b41c3b9d4a0c3d5fd39c38a5f7f02b3445efe8dd01422 SHA512 e4feaeda3d910d156e03e58d844dedaa8edfbe40f24c74660e0a00d4ca76e9509144e705a1c90315fab3c77d40728b00d17a3d1ae021c67faecf40e04bb1fd2b
-EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1038 BLAKE2B 7ef743a367ad084d2ba480fdac699237a53fb63b62d6467acf21fe8dc7fe8747bf04c1b3380ec7d0ce89e2fc821f1a009c9885a4f44fd3c8396d4407ff676e55 SHA512 98781f21a593c19d8a3f6bd15b345a3cd84ebf9e07b56c0e36b0411bc865414935a64440c96d6ba6f2c7aa02e11f9c5158ebd283589651e2c6acb4c55624104c
-EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1053 BLAKE2B b749921f555023f3ad1b22d0187f9c5b49c072907487652d86754cd67c4c517f139ec21da1b7804450cde0fa848110cf9048bed70cb93bc57ee92c72382696eb SHA512 d65d9f5b9720d47915eda5f0f978d28a413df7c47376698d9fe10570dccf8f4e12099193c5c5e1f4677ccb2a456caa923050e82517fd4b7c92ea98096f3b1e4e
-EBUILD docbook-sgml-dtd-4.3-r2.ebuild 1034 BLAKE2B 9df82149941d8c53a7cd04185c9dc42a51f6215ec89d1ed7f452e698b16d49d0ad80d150d8abcaa442d9e270541bc848f2c24806e395373093a0667a9531a4f2 SHA512 2d88c0f7c3d848a26aece7998a9eef6d0a31ba01ebf656d610664e5e1a8e07fe92418e837f5ef2e0ac56a594ed1d947da2e4aee092f855a7b2c1e1bf8dcf8b6a
-EBUILD docbook-sgml-dtd-4.4.ebuild 1044 BLAKE2B 0af3122f2b5d7ddd224b2434df8ab2c88d4771d3466d3480709d45974cb4005205864acb28f66183dfa1a86cdc5952b3ac35c0501ebcb184a0291ab78702a92d SHA512 9df85ac8bddd8c0d61b6526cbab67d4f0fd48b3c1e433b1afaa56dc66ccc6a4bae8e6b9d46929b83e596c0da7730e259f2d0fcb32ceaec27c2dbd48102bec9d9
-EBUILD docbook-sgml-dtd-4.5.ebuild 1053 BLAKE2B e986e5bf707dd3d1544a697301af30aea06c5c0aa91f6b05a60dad044359646c216886cf6ad5b588382c958662e158328f0722a233ab02fa78f341f5d6e38439 SHA512 4783873256131bba3c1d7c8f40b13cdee725a53699a6e8c06178e6ebf9eb0134b34bc9a6e0553ac3f52415628fcbb1ff713b6e7fc1fdd2aaa8929a148a802641
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 998 BLAKE2B fc8be7bd4259b96824f2384eaa2d54d3422737db2780d0a933e6919cdca4ad43e34f5c0f61cc9205ccd5a49d7fac69724df94de412c068fa797f8da2a7823760 SHA512 de1cf8959986887ce10333bf599a7f6af2c075550ebc935ca9013af9500c3ed3a18e86f7eb4b3f5b82f094e6905cc0ebaa0198f6a25b2efb318576348538a0fd
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 998 BLAKE2B 42b3769142f9892f769a4e777b4f4030b2dced088d2006d45d9fd77c3c463ed68d6a2f4b341eaa677d7ec7a339c8cd83d30297cec023d1ca0ac904bca1448fc1 SHA512 f3b626d5576e137bbe58f169ca11d237194e94c0eaf3d4e45c8e398493dad0e1c5a861d414c836af749d102ff899465977e705528675967ea9ce4cbc8a7d6eea
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 998 BLAKE2B 46ed9d8b063dabdfaad0f7165add39a1df5ef6c20be2bad899b760f013bcedd86b70d08b3fed04a7ee175ed2e558a3fdd11f82bcf941470c78e8ddeb471e65b3 SHA512 8a395cc78213ec47b3e18a5ed0edbfb617cfbd1c8d3bacb2bbae868b79ea192834acf7c53a9d2712b0a938c15ca55d8550241995b38b2e53147f11d014aa7f96
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 998 BLAKE2B 400ca316284254730bddafc254b2b05f74a92a85090d5e1f148dbc765eb7b4fc33544002cae0bb97e7797872340231862574d92f6555e75b45ebbe35427c6482 SHA512 560c60e3d575f6d8ee8992687394b1b9b417462f60f7cc0f4d2bc223b03fb5fe09c372d3bcae15b5ed69eabf408453e2a0d0941c08b556c3b3d0dff292589dcf
+EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1013 BLAKE2B cac364ca6db8c7a338e7aa246e50d11dbeaa7e1eae0fa90548e5e9696d739b9680927c2555c1b14387191cbd819017bd78b0485cb70634ffc618c8d09a88073b SHA512 0aa4acca46286a4c6af9c89ebbc959a2660c23c2ddbe576aa338548b4f101a1697cb3745151cb96d2b28c60dc1a584cbfce69af748284b8893743dd405c5089c
+EBUILD docbook-sgml-dtd-4.3-r2.ebuild 994 BLAKE2B 8563c3b0104fc86e7084ecf3bf6346eefbc843d9ade51b9646cffe1d560bd81df399fc92aa6a33d4e8d7ef9ea62f9f026aa41e0703631eec4837819135f10e18 SHA512 5428471de628c6821879af606f8a620f8ecd03a55457bd38b6b1915cb89b373e8989b3b55d4d00e9b4ba125abc6649559d1b5806c69abaca02fc1bb73e18bdc4
+EBUILD docbook-sgml-dtd-4.4.ebuild 1004 BLAKE2B c9e63807397bdad3b387f43f23663f58578db0d6b102c45a6ac98cfb2f1bc770e8fb208379f02ce6cbb4f9495bae8b8b1c80767d3d2ac2f6287311524c93e947 SHA512 ba8a6e5ae3d8edfa185bbf334326fae1a8b9a3fb57114a4b6b117de0053ccc9a09ae7c086c1b94ec0e527bd73526dfe99b0a5caecb3ea5c3d9c9339d41e30397
+EBUILD docbook-sgml-dtd-4.5.ebuild 1013 BLAKE2B d73fbbdde2122516b8aeb56e4b4593097886f09b5a088a7607c968d52a6d26c212a4d97f5bb1baa4e15b3c9e1f39ddd4142913862d0cb2b9437b94103681edd9 SHA512 415f0b59959430d3babb1bf62e29b0cb93e58751c591993e61752d5240b3a263e14be8728fa51129a5eb378a8c0859dc4ef7172f01b2ef4098799ebf2eac2199
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index 7bc31b24ab58..e53da8b333fd 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk30"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index d2bee0c42c72..25ee2b14ca9a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk31"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index 6fd11edf5a05..b0841961d098 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk40"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index 49cab1b00620..465f9932818c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbk41"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc *.txt
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
index bc684fd098a7..3148720a2ac7 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbook-4.2"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc ChangeLog README
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
index e99be1ef8943..7f5046ce6090 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbook-${PV}"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc ChangeLog README
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
index e8a045063c2a..42f570ed67a4 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit sgml-catalog eutils
 
 MY_P="docbook-${PV}"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
 	dodoc ChangeLog README
 }
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index f3897d253127..df3790d1df7b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=5
 inherit eutils sgml-catalog
 
 MY_P="docbook-${PV}"
@@ -16,22 +17,21 @@ IUSE=""
 DEPEND=">=app-arch/unzip-5.41"
 RDEPEND="app-text/sgml-common"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
 sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
 	"/etc/sgml/sgml-docbook.cat"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
+	default
 	epatch "${FILESDIR}"/${P}-catalog.diff
 }
 
 src_install() {
 	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
-	doins *.dcl *.dtd *.mod *.xml || die "doins failed"
-	newins docbook.cat catalog || die "newins failed"
-
+	doins *.dcl *.dtd *.mod *.xml
+	newins docbook.cat catalog
 	dodoc README
 }