Updated with patch for bug #251533 (relpath empty string replacement

issue).
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 x86_64

4 files changed, 34 insertions, 14 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 8ff0c1fbada4..6e6c7a250392 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.154 2008/11/04 09:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.155 2008/12/24 02:18:09 nerdboy Exp $
+
+  24 Dec 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/doxygen-1.5.7.1-substitute.patch, doxygen-1.5.7.1.ebuild:
+  Updated with patch for bug #251533 (relpath empty string replacement issue).
 
   04 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> doxygen-1.5.7.1.ebuild:
   Add flex dependency.
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 2e9fba7237ae..8be869c601ba 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.7/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 AUX 1.4.7/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9
 AUX 1.4.7/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2
@@ -11,6 +8,7 @@ AUX doxygen-1.4.4-darwin.patch 536 RMD160 367a923f0ddda5f52487896d86301aaef7328d
 AUX doxygen-1.5-legacy-patches.diff 7242 RMD160 0100a2305101b392764eaf867a32e0d14dcf9208 SHA1 bb564532f157e72436e0c8ecbbed163d96db3674 SHA256 f696c10fe571d281ed8178e7a07864c7a5bba9cc21ac723ee9669ac32e43e114
 AUX doxygen-1.5-qtlibdir.patch 354 RMD160 9c9491d89379f1e68e57722be438ce6af80110cd SHA1 7a26ec0fdc2dd22f97c1fd2acad21188137c71b2 SHA256 602038066a93ffd163c7f18b15362a9f2443bb7e842675d7de81bf5026ca9c2e
 AUX doxygen-1.5-system-libpng.patch 5332 RMD160 cfa7709a0f867609cf149407d19df2ecf53af750 SHA1 9b0547b64fd9b15406a72b18fe19673f784c50f9 SHA256 5800013e75e3fdb4a6dbc513a25393ec9cef0dfa412032c1c3de562829ddaeab
+AUX doxygen-1.5.7.1-substitute.patch 656 RMD160 3730347b9fba4ceef96b6852c164ca4c9037c250 SHA1 e470ee8ede9293cda8ef00d059ca338c725e8523 SHA256 204f140187865c9eb5ca76a421cf1271dfb696858269477468bd605070bd41fd
 AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1 ac7ed139251d87876e67b3e5ce04652b3ac27795 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce
 AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 RMD160 8d83de95c416a352caa101277874caa1f68347f1 SHA1 ad1d388686b9cd9f330bc5091f15ccc485c8d614 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069
@@ -23,13 +21,6 @@ EBUILD doxygen-1.4.7.ebuild 4161 RMD160 01bb1a92077fd72ce6cb687aa97990f9164172b6
 EBUILD doxygen-1.5.4.ebuild 5206 RMD160 fc46e07ed6b9fdd4d987df48a1a9cc86c9774f43 SHA1 de238baf5fbcc2131aec5001a1ec56d489f99d7a SHA256 268d07fe89f7e6dc7a034ffb682a1ec3084383c6e40f9c869b06a16852a0c3e2
 EBUILD doxygen-1.5.5.ebuild 5252 RMD160 0f0cb0e87142722e62143fc3baa75665afaedbcb SHA1 f283652f15a7cfaa1d14125dcc7ada0752a8dfcf SHA256 694ccc2a1386c7b9aa2e4831428ddfb6640b25be2e439730d4c7c982da4b63a8
 EBUILD doxygen-1.5.6.ebuild 5252 RMD160 1a245f30d3cf2d0fc74776eb01d649f96f8222d0 SHA1 8cf3db42b337085f9c2cff9d3478b87b3a1a5c61 SHA256 22d7978852553f6ea86f02b0e951cb436446207c2a77bf1e96acfcd37ad85023
-EBUILD doxygen-1.5.7.1.ebuild 5318 RMD160 57bae61e35318d5f87ba2325c5e8f917dbe32014 SHA1 96c76691e29ac38b3d389ad43ed332c143643539 SHA256 a6284e646e8826a632a28264b8031e3cd191b3c15598981dc8b2bdf120689964
-MISC ChangeLog 26033 RMD160 9c994eb37959cc578edbbea0bdf2986040dd8b03 SHA1 2d98f142cd2c7fae2785993ee63bcd2d153adbb4 SHA256 2243c854d579483fa8d1000379cda2f930f3383510a02f980a63777c9d9480ef
+EBUILD doxygen-1.5.7.1.ebuild 5360 RMD160 746ee8a1006f6c1a4e32d52ea4ef78b921d16ad7 SHA1 ad53ae134b2f16455d157cecfd502e258bf3f8d2 SHA256 d9354d550d0842c14a61aeca7ecfdd2985cf72a73436d9f511db6d2a9c94676d
+MISC ChangeLog 26227 RMD160 7649e49ed4d9b31d5ef5e484af449c9808f51c2d SHA1 3983f8d080718815f42aca4a81cf924ff96949c1 SHA256 8c1365a1b10585b00527caf4a7ef6055212539d40e7d255fba5134b5119aa8d6
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkQGpUACgkQAiZjviIA2XgwVQCfUNtTkIAJV/HkIpaEeviFshZt
-+uQAoMPcmN8FbD7JB7pQxJ3IP5TBc2sX
-=LGOQ
------END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.5.7.1.ebuild b/app-doc/doxygen/doxygen-1.5.7.1.ebuild
index 941cc09b5427..bfbd9d7bffc2 100644
--- a/app-doc/doxygen/doxygen-1.5.7.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.2 2008/11/04 09:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.3 2008/12/24 02:18:09 nerdboy Exp $
 
 EAPI=1
 
@@ -57,6 +57,7 @@ src_unpack() {
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
 	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
 	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
+	epatch "${FILESDIR}/${P}-substitute.patch"
 
 	# remove internal libpng - see bug #210237
 	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
diff --git a/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch b/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch
new file mode 100644
index 000000000000..7d87d4a880d2
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch
@@ -0,0 +1,24 @@
+--- doxygen-1.5.7.1-orig/src/util.cpp	2008-10-04 14:28:00.000000000 +0200
++++ doxygen-1.5.7.1/src/util.cpp	2008-12-18 20:55:15.000000000 +0100
+@@ -4447,10 +4447,10 @@
+ 
+ QCString substitute(const char *s,const char *src,const char *dst)
+ {
+-  if (s==0 || src==0 || dst==0) return s;
++  if (s==0 || src==0) return s;
+   const char *p, *q;
+   int srcLen = strlen(src);
+-  int dstLen = strlen(dst);
++  int dstLen = dst ? strlen(dst) : 0;
+   int resLen;
+   if (srcLen!=dstLen)
+   {
+@@ -4469,7 +4469,7 @@
+     int l = (int)(q-p);
+     memcpy(r,p,l);
+     r+=l;
+-    memcpy(r,dst,dstLen);
++    if (dst) memcpy(r,dst,dstLen);
+     r+=dstLen;
+   }
+   strcpy(r,p);