Drop the DTD reference mangling. I introduced it myself in 0.1.12-r1, in April 2007, when the SGML catalog was in much worse shape. Fixes bug #390509 that was causing network access for fetching the DTD otherwise.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 16 insertions, 39 deletions

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 7d56f6660ab7..cb83c10c0549 100644
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libusb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.120 2011/12/03 18:26:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.121 2011/12/06 19:33:32 robbat2 Exp $
+
+  06 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> libusb-0.1.12-r5.ebuild,
+  libusb-0.1.12-r6.ebuild, libusb-0.1.12-r7.ebuild:
+  Drop the DTD reference mangling. I introduced it myself in 0.1.12-r1, in
+  April 2007, when the SGML catalog was in much worse shape. Fixes bug #390509
+  that was causing network access for fetching the DTD otherwise.
 
   03 Dec 2011; Raúl Porcel <armin76@gentoo.org> libusb-0.1.12-r7.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #390441
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 76f9e3f58439..6074f5df9a20 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.1.12-fbsd.patch 2477 RMD160 aa92a57100c98cf1ef900d1f27685a33a9c3fc91 SHA1 75dbab5891a5753463661806e89263f13e8653b3 SHA256 21ef0d24c6f64d5aaa50e358a342071d120154425d7d034c1f4efae9f8efc24d
 AUX libusb-0.1-ansi.patch 4599 RMD160 9aa540748c939f43da218982a7a7067c33834b9f SHA1 d383ffde3baeaa78a2c148dee69777cf5c61102c SHA256 237920768d4bd84189159e488b0c5c1ecb0e4abea82b1a316b16dacb1016698b
 AUX libusb-0.1.12-no-infinite-bulk.patch 807 RMD160 bba6194bb6cc9c0008791684c325c599ea6a2415 SHA1 92b97b247baa0e548f1909addf69bb159534a991 SHA256 141b8a6f6e4cef3b9e08377cb1d79cb9398f2437894d368d0eca8f1c07848db7
 AUX libusb-0.1.12-nocpp.patch 572 RMD160 cdceb6a5550a6371401046fb26a9ccc67e4a3d5d SHA1 c55022ae4965b469949329cd6839707790a44ec4 SHA256 6a9833ea9238b9df0f6a359c3d84f829bdf83e26dedb31ce9d614f9c6cda3ab0
 DIST libusb-0.1.12.tar.gz 389343 RMD160 63848df717e00fff67ab30ba86a85466370d4e8e SHA1 599a5168590f66bc6f1f9a299579fd8500614807 SHA256 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44
 DIST libusb-1.0.8.tar.bz2 331820 RMD160 5a413a77e240a15480ef1437d5f5393badbae985 SHA1 5484397860f709c9b51611d224819f8ed5994063 SHA256 21d0d3a5710f7f4211c595102c6b9eccb42435a17a4f5bd2c3f4166ab1badba9
-EBUILD libusb-0.1.12-r5.ebuild 1669 RMD160 2c5edee2593448fd142f9b66612ed6f5c1bcca54 SHA1 15ce66a61ee94b21427973584f468568e83a8800 SHA256 a74a92cf8693a436a75b2e6c13aa6edc963d3b96223c371251a2733fe2a0d225
-EBUILD libusb-0.1.12-r6.ebuild 1734 RMD160 2f05b1bf971d25f55d031ae06c7d3f9d051d6825 SHA1 bb0e5f4ac45f35a8e977a244baff41f85b216aa0 SHA256 ea0343cda0b4ce9887485c89602624c87e329bffb597ed65881f84268c0c5a96
-EBUILD libusb-0.1.12-r7.ebuild 1725 RMD160 aab8487e5add84eea90c542c69549e25b709fd75 SHA1 4be0fa79c099bb35622d3213e9a29d0625f5a21d SHA256 5dae69d243bcf8c37dc86ff8aafe9c9e3faf2e6d64ac9d58b324ba1b8f5936c5
+EBUILD libusb-0.1.12-r5.ebuild 1409 RMD160 18df722d7db7447be2bcbc65c7ce2d050daff3f0 SHA1 eb8df7da42983142e98d84880ced5eac54c0867d SHA256 f8f800f7d6919261b06eeab74b6434e736f4d393fe55f4aa7b9abdbb1721c6e0
+EBUILD libusb-0.1.12-r6.ebuild 1472 RMD160 0224b466e7eab6a9c0c56048127b30c3ee7cd604 SHA1 e0f7e01b0338815c70422adc75aa9c3ae871f608 SHA256 5d81d4f0fe0470a53c14a034a4f8211f567bd3515de631e726a4220fea251087
+EBUILD libusb-0.1.12-r7.ebuild 1548 RMD160 51a2312908fb3a083f05ae267dc8568e63d21797 SHA1 44a71f211380055f25307d8f862e27e71aef85a3 SHA256 8ee96f874c25faa440ea3665c30357045753adb4d0aaf59ea5a5030429a48a73
 EBUILD libusb-1.0.8.ebuild 1083 RMD160 5fe5b98c76f9b721369a162fc26af411ac6073c0 SHA1 73b393275c1dfa1a25446a167f12b79583dcd376 SHA256 9ef0e1dfcfe44de8825b6a8fb91f48ab7abbaa3b447ec3292c267ccb1072015f
-MISC ChangeLog 15535 RMD160 8224ede5265e0cb89b833b01107521ab1d6f2095 SHA1 baac066a6360542ee80c1e984517ed7422854230 SHA256 6feba1171a52d613955c6700690d2b26d9aec47f97a7201016750bcc526d7e80
+MISC ChangeLog 15886 RMD160 83dea141a141352d096a67734135f27548ebca8c SHA1 6bc7bd314639be4275a52555b6e632af1fe2a331 SHA256 a6db8ab5c4c031c0dc142cd46b43b3825b7d1399a2e4b3ca0a4488bc48daf6c9
 MISC metadata.xml 204 RMD160 c8357c2cfd2ae4415ccd01ab839a3a4260fd8367 SHA1 7e046a19d6d3ac8caa658059c5c268630d1e99df SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7aacEACgkQuQc30/atMkCzmgCeMQUGYkNa0Gcyc6GaounETPCt
-FNwAmgOaLIB5f8Oz4b7fXFyS46hiboka
-=6srB
------END PGP SIGNATURE-----
diff --git a/dev-libs/libusb/libusb-0.1.12-r5.ebuild b/dev-libs/libusb/libusb-0.1.12-r5.ebuild
index 6ddb9e207011..3a6dc242f544 100644
--- a/dev-libs/libusb/libusb-0.1.12-r5.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.9 2009/06/01 00:00:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r5.ebuild,v 1.10 2011/12/06 19:33:32 robbat2 Exp $
 
 inherit eutils libtool autotools toolchain-funcs
 
@@ -31,13 +31,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.1.12-no-infinite-bulk.patch
 	eautoreconf
 	elibtoolize
-
-	# Ensure that the documentation actually finds the DTD it needs
-	docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd"
-	sysid='"-//OASIS//DTD DocBook V4.2//EN"'
-	sed -r -i -e \
-		"s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \
-		"${S}"/doc/manual.sgml
 }
 
 src_compile() {
diff --git a/dev-libs/libusb/libusb-0.1.12-r6.ebuild b/dev-libs/libusb/libusb-0.1.12-r6.ebuild
index 36fc2c410a30..0abd8ee0fbf5 100644
--- a/dev-libs/libusb/libusb-0.1.12-r6.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r6.ebuild,v 1.1 2009/11/11 08:02:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r6.ebuild,v 1.2 2011/12/06 19:33:32 robbat2 Exp $
 
 inherit eutils libtool autotools toolchain-funcs
 
@@ -32,13 +32,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-0.1-ansi.patch # 273752
 	eautoreconf
 	elibtoolize
-
-	# Ensure that the documentation actually finds the DTD it needs
-	docbookdtd="/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd"
-	sysid='"-//OASIS//DTD DocBook V4.2//EN"'
-	sed -r -i -e \
-		"s,(${sysid}) \[\$,\1 \"${docbookdtd}\" \[,g" \
-		"${S}"/doc/manual.sgml
 }
 
 src_compile() {
diff --git a/dev-libs/libusb/libusb-0.1.12-r7.ebuild b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
index 4219b77fc5e1..877fecfbde41 100644
--- a/dev-libs/libusb/libusb-0.1.12-r7.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r7.ebuild,v 1.10 2011/12/03 18:26:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r7.ebuild,v 1.11 2011/12/06 19:33:32 robbat2 Exp $
 
 EAPI="3"
 
@@ -31,11 +31,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.1.12-no-infinite-bulk.patch
 	epatch "${FILESDIR}"/${PN}-0.1-ansi.patch # 273752
 	eautoreconf
-
-	# Ensure that the documentation actually finds the DTD it needs
-	sed -i \
-		-e '1s|\[$|"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [|' \
-		doc/manual.sgml || die
 }
 
 src_configure() {