Use URL to find dockbook dtd rather than filesystem path.

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

diff --git a/dev-libs/libusb/ChangeLog b/dev-libs/libusb/ChangeLog
index 05e75b8ccc5960ca9bd5bbb05e32bf451854b656..0baadda07f814b9067bd67a49ebd9e555a2ff7e3 100644 (file)
--- a/dev-libs/libusb/ChangeLog
+++ b/dev-libs/libusb/ChangeLog
@@ -1,6 +1,9 @@
 # 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.114 2011/11/13 19:03:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/ChangeLog,v 1.115 2011/11/13 23:14:38 vapier Exp $
+
+  13 Nov 2011; Mike Frysinger <vapier@gentoo.org> libusb-0.1.12-r7.ebuild:
+  Use URL to find dockbook dtd rather than filesystem path.
 
   13 Nov 2011; Mike Frysinger <vapier@gentoo.org> libusb-0.1.12-r7.ebuild:
   Convert USE=nocxx to USE=cxx.

diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index dbd5f4e7aab9ac36d947cb765679fe35daa1dd8a..88ba31321f7c28a60f2a2bd6312cfd4343ea3330 100644 (file)
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -9,14 +9,14 @@ DIST libusb-0.1.12.tar.gz 389343 RMD160 63848df717e00fff67ab30ba86a85466370d4e8e
 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 1828 RMD160 fb3e8ab8b7eb105de17eb0da50941a8931063022 SHA1 f79fb8206a1eba4fc8302e8e5fcb2b7359e67a6f SHA256 e6894f24ddf4a910a77bb7530c924cfcfd91bf43fe15a5ce624828921e9d3f3e
+EBUILD libusb-0.1.12-r7.ebuild 1733 RMD160 08f5b090f762d6057fee3204fd40f6d18e151a4b SHA1 82e22b46c430461aa58103128c6cec4be7e5e5c3 SHA256 cc5aebe63f109e7a7804fab1bc4e3c1a9003fadf0628596ddb3cc39b8539a32a
 EBUILD libusb-1.0.8.ebuild 1083 RMD160 5fe5b98c76f9b721369a162fc26af411ac6073c0 SHA1 73b393275c1dfa1a25446a167f12b79583dcd376 SHA256 9ef0e1dfcfe44de8825b6a8fb91f48ab7abbaa3b447ec3292c267ccb1072015f
-MISC ChangeLog 14843 RMD160 a3e4e20823a78a729ef4d1bc90734b7494c4ab59 SHA1 894c08779f9b9ca6db22994d4eda7946416f79cd SHA256 11b93f0cc273bc0f9800cd182f24c8e78ec73dc9feb71fcc568669ad5b5f632d
+MISC ChangeLog 14979 RMD160 50b48ce3dcb653d818190ba31dcdae59ce6e4038 SHA1 eabb649baa4264a460d939a04b7ef0089c114fc5 SHA256 a0014d7955dd7de8c3bbfb7f86436b6f9e99fd85feee225a6bc7d7ce310cca44
 MISC metadata.xml 204 RMD160 c8357c2cfd2ae4415ccd01ab839a3a4260fd8367 SHA1 7e046a19d6d3ac8caa658059c5c268630d1e99df SHA256 f3aeb60df346d19b4d43cea2b2916d51674d99dabfce252723548687909cbd6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7AFHAACgkQaC/OocHi7Jbp1wD+OMAW2Sax1PIfdRg71QACLH/t
-IwYTeu3rU3PudqCaRwIBAIBf0KpK1ktcF+eL0179jZBtGrLhA9Sbk+FWrXLKeAjX
-=UUio
+iF4EAREIAAYFAk7AT2UACgkQaC/OocHi7JY8uAEAoTbX0WlJEGjTHigqu9veHHt7
+3WLGGucVNhE0R6mUphEA/Rx7KXZoUWIx+D19euEn+rwMqTCHGLUIvnHaZBRlj0i9
+=8/ra
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libusb/libusb-0.1.12-r7.ebuild b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
index f97dd3f4fa0306d97d8f7fc970ea26c569b58b7d..6e84b059f23aac982ebfb34d10b421c7f1d84bfb 100644 (file)
--- 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.4 2011/11/13 19:03:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb/libusb-0.1.12-r7.ebuild,v 1.5 2011/11/13 23:14:38 vapier Exp $
 
 EAPI="3"
 
@@ -33,11 +33,9 @@ src_prepare() {
        eautoreconf
 
        # Ensure that the documentation actually finds the DTD it needs
-       docbookdtd="${EPREFIX}/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
+       sed -i \
+               -e '1s|\[$|"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [|' \
+               doc/manual.sgml || die
 }
 
 src_configure() {