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.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 12 insertions, 25 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/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() {