Upstream patch to fix #417667

Package-Manager: portage-2.2.0_alpha173/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

4 files changed, 83 insertions, 12 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index b0cb1f913ff5..5f153d269298 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/vigra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.59 2013/04/12 08:14:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.60 2013/04/28 15:42:20 grozin Exp $
+
+  28 Apr 2013; Andrey Grozin <grozin@gentoo.org> vigra-1.8.0-r1.ebuild,
+  +files/vigra-1.8.0-doxygen.patch:
+  Upstream patch to fix #417667
 
   12 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
   -files/1.7.1-automagicness.patch, -files/1.7.1-fix-nosetest.patch,
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 8535106db35b..a3f89cdb0134 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -2,21 +2,30 @@
 Hash: SHA256
 
 AUX vigra-1.8.0-automagicness.patch 1509 SHA256 55b89813234db00209c5c7c5f191861e6e3a0d363006acf972311ad4c3b0cd2c SHA512 a460f6764fff98e4e982863b2444f8ec832506b9c75695b721214ffde28831a8d9828985929eded72ad4f36b0963a6c93434313a3ec801ca244a66eda74cd55d WHIRLPOOL 385a939d54dc73ba50c9be7fc89defdf1d1c28a31fe33e16dfc459ce9d6231f3dc3671a80dbe3623bda56862e7af02975c9d911185d13f62f2d4d6d3ad8b7d36
+AUX vigra-1.8.0-doxygen.patch 2018 SHA256 8bd12921d90a14f91d22dcd6709a4cfe2e96b48d60352c9141c842f6b9c6bb88 SHA512 9c6bf091175fc02b56ec89e0f0211de7848202d950fdf81323da78cf9942bc2567f3af313ca17e02805403f0eb2e5e53e3e4335e5bf4dd9e209ccb292dc46085 WHIRLPOOL a464eee54d1c4bf21164500d30b34c026421ee06d789049a5ab21dff0b97c641fe15b67cd12c754652d043183bda460b0aac78e2b90ea63a911c6ad3d58cd745
 AUX vigra-1.8.0-gcc47.patch 951 SHA256 d5639c277d8e1504ea37a492c505dffe85db7285bed1a4de37a92698f2b1aaab SHA512 a05f7b2ba49b3241bba92b4483dd57c34b5ff51d71d274817e3967cf8346d5156d8179f3c0e98939ae6318c4b1cde2d5b9766a1e949a3c0ec991f8262551fbcb WHIRLPOOL 7bdce572c8ea23e887e2cd3e6f7a323ac70e09b1c2aeadcd7720ab38044643e3c9daefcc484eb03132a1d822ac3ab182986cd08d04408b8d8882159e58d0fdc2
 AUX vigra-1.8.0-numpy_doc.patch 990 SHA256 799527eba516607956030487b084f99f47037cc928a0ab84fec86bc9c00074f6 SHA512 da5f73c2d18735be63e3e1637b14fb243e509f6c0e7988acc75eccb41e41d3b16b2b8f241b21da517d0e7a454d6be58e1585015d9ce6908e6863bfe0790a5049 WHIRLPOOL a086912ef98565a2fa177f2de19bc26c699ccc2393a7d5d073152f9763913951457cf6e1557d1ddc12387cd126bfd74b5c054f663c09ecdff7a6e4d31aee49e5
 DIST vigra-1.8.0-src.tar.gz 29814914 SHA256 fc3a87d220ce23e79d163c58dd280fd534b81a870d2b140f1d072bbc82c78214 SHA512 a7de19bd7e24442fa488053ff16e54c7b1789a2836069a94a2f5a77e8dd7e9aa246667034d582eb98b1b396ffe4f860d1a87436f804d5256e916cc860c973de1 WHIRLPOOL 002d4cb5a74741db53e4215888357a68c39680632059f3e83e1f67e820a99a48b15c0f0ebde5aea8ba50dd53a7c80d4408c1dab32bdfeb6f1c3c95685597f3e0
-EBUILD vigra-1.8.0-r1.ebuild 3094 SHA256 4a9efef8fc6d258e92279cebea250069f99fe57ba5fb39b950d4001a5f4f3637 SHA512 11076c86766af283599626d9b4e36bd6730529388b1be6d35bac46e699d056dab67953ab6fdf9227a96a7803a36728086b570ed70c988e9cee5332eea6601d4e WHIRLPOOL 07c0d450fd5993cb2f5db831283b159a3fb3956cff056ab9abb188e84e6996ab2da86037bf3347867eec7fc2d1fb7b737bc93ea56b09b8cbe2711bf4ed2a88b2
+EBUILD vigra-1.8.0-r1.ebuild 3128 SHA256 4da063e377133eb2170f737618554cb3fecdeb1ebd7e59aba9a4fdec04ba82c6 SHA512 432332e4818b15ffc569ecdea0498c9b6fe4840ffe3dc2497386e322a0827ad448da226c748cec4828632ae6c10b2c277cde05f2bee4ac029ce36fe34dcf24bd WHIRLPOOL 9d328c9e12f799081d1948b7fbc57f5790a9ee88db30e30af67d790efab31657ed27f8b196cdf20beb353caabeb1dfc6341c3ec040f37185f6675064a4e5c3a6
 EBUILD vigra-1.8.0.ebuild 2782 SHA256 68381d99ea67f61481f8d98333a9ca063cf657b5ef4993e831847d960f631943 SHA512 eb5773a44f026424d9bb478d5fbfc6856c26db6b1167be9bbe189ffb3ef9053b4819db8931bee555686e8651a1faeb3805ca6320a0253f6ab0efaa4316eca251 WHIRLPOOL f5a0045c703cf5be8b09ee66320a736723a26e82448d590a171e9cd23b95e5a35d0ddb3344a4ae8148da5505753a2e5f6a4c0eb4a9246dd8df7b730728304e84
-MISC ChangeLog 8773 SHA256 4e9b1ea875f219f116519803e1b6958967419699a03fcc76b34bb7bc2736ecd9 SHA512 dc94bd5da5d45d057c155b28aeb48a3f8d7e8dc653d0e02c6b58bac775f6ddf6e62e2dd6baafad88929d05dd67ad0fa0dccb116bdfa3813abca00d68c0c4d236 WHIRLPOOL 7ce1027af5ab948a31937e0bc0a65bfb4361c88d6ee62cf2014c22d041af078f6878c17ae0bf19674d878ee33cc5c4c204ca8b5df300e8528911b0dad95ab3bb
+MISC ChangeLog 8911 SHA256 0a1ecce4cb103a973393c5ec93c145b47af14d290c07725f9e2aaf47e641ec77 SHA512 2dc8c0c8a8c83d665a711b38699470f73021f67f2961603ba504c849808fdb9f952bc8ad068842e1f5e2ac4100a643576bbf0759afcc52e2b3eee5185d8f75ca WHIRLPOOL 6d77b4643323394a260e904dc21d3a6272ac36e98ff1efdc4be6bf0a407a52403cf618b6f81fc53aafe9bd3287948dfb427127945de6474a34290883837c47e4
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRZ8JpAAoJEEdUh39IaPFN2cUIAI0sw6DG0CVraGBlFg35FkyY
-+z2YTWjaHf+4URn+3gNX/GkY/me3AA9tNvyTcz7pLmCygcILKc5lex7caa26qPaX
-fwyuG1Cid98MyCnIu4YaE1HLfSoInvFoiPnh83cMJBHiXxDcpNZ8W5EwrbILGIVt
-iE1+kZN7tQnraipWh95SqgbDCFcn2+rn6G0YFdTUHnFzhqLUaDr++uzhebVVc/uE
-ZrdkcB/8kI7Rngd1SoeTGt64dO6ZvFzyaiW70yRgSYXrX//iiADX3MHR4M3anNqX
-MM816G1wCBhay6xLcDtg7OSuwWN6ZvELFR2kMujSOx3IyUewZDVaZCyPRWazUW8=
-=fYF2
+iQJ8BAEBCABmBQJRfUO/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MPBwP/0YZnmA4xQPJccLUeZQLKKkH
+Gw4GA7TUHdOBktgDjdRjjujLvEtM+T+ZGIX4enC/IfcgMmmaM4JVNkZRnG1mrl6j
++eO5o4N1Kp56w7VH8QPZae4tzBSB21sryMqV4RIpzz8EgZmO4GebhShk9A4Ys/92
+1YmRbnDpUWsTaWDFyAN2wVl/11WHrMX8xlU9tbNCaC6WTovdlp0WX/fC1qUUpKLy
+o58/EmxmNwhyzZ+rX7nLK98z5y84EoZtsKhAS8krYz6JrKeS9OrYmkE75OWliuwG
+d/tY74oOlRd+CPeFtTJtaXrvx5SVJB+WbmiTnQ590CVxIluAxpKhgfzFifgyfy6V
+M/Z/oNwa626mijU9ux3iZoSW+Ba3IukRNYFrKTN6CYApA4xq6hkIRIQCHUxulIVd
+5qpF8fsT65zD/GeIpMdKDOa41sutoxcVHUNhdGRprmT6sAZT9KxDDN64wct3USEW
+fdEeDRM4+06AwpgBkgjpWOWPmnTrTDwntpWGge1zNfX3kCQ71JMhbFo0PU+aSGcC
+do6kL60g3+VvMNr3LPgIxgcvTU3jsrdvc2C3J5+SBi8DNF1nCDoIC07BBCNUI1XA
+K+bmwAQSwiI1viSbqqfmEE/K5Uo0gjY1A1sJ2Ybky1Qigzo7EMpOLxA4NfdlT2oq
+WFF6UCGCmF3UamoJ8SRN
+=FYDB
 -----END PGP SIGNATURE-----
diff --git a/media-libs/vigra/files/vigra-1.8.0-doxygen.patch b/media-libs/vigra/files/vigra-1.8.0-doxygen.patch
new file mode 100644
index 000000000000..c264a67c0172
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.8.0-doxygen.patch
@@ -0,0 +1,57 @@
+From a8fd9ff8062152ccdcec7d63f2d5075f29ee2429 Mon Sep 17 00:00:00 2001
+From: Ullrich Koethe <ullrich.koethe@iwr.uni-heidelberg.de>
+Date: Wed, 21 Dec 2011 16:31:56 +0100
+Subject: [PATCH] adapted regular expressions for doxygen 1.7.6.1
+
+---
+ docsrc/makeFunctionIndex.py | 4 ++--
+ docsrc/post.py              | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/docsrc/makeFunctionIndex.py b/docsrc/makeFunctionIndex.py
+index 55e74bc..06300e2 100644
+--- a/docsrc/makeFunctionIndex.py
++++ b/docsrc/makeFunctionIndex.py
+@@ -119,8 +119,8 @@ def generateFunctionIndex(functionList):
+     text = open(path + "/namespaces.html").read()
+     if text.find('</h1>') > -1: # up to doxygen 1.7.1
+         header = text[:text.find('</h1>')+5]
+-    else: # for doxygen 1.7.4
+-        header = text[:re.search(r'<div class="title">[^<]*</div>\s*</div>\s*</div>\n<div class="contents">',text).end()]
++    else: # for doxygen 1.7.4 to 1.7.6.1
++        header = text[:re.search(r'<div class="title">[^<]*</div>\s*</div>\s*</div>(?:<!--header-->)?\n<div class="contents">',text).end()]
+     footer = re.search(r'(?s)(<!-- footer.html -->.*)', text).group(1)
+ 
+     text = re.sub(r'Namespace List', r'Function Index', header)
+diff --git a/docsrc/post.py b/docsrc/post.py
+index a8836d5..fc51f8d 100644
+--- a/docsrc/post.py
++++ b/docsrc/post.py
+@@ -51,13 +51,13 @@
+ </div>
+ <div class="contents">''')
+ 
+-# tested with doxygen 1.7.5.1
++# tested with doxygen 1.7.5.1 and 1.7.6.1
+ mainHeading4 = re.compile(r'''(<!-- Generated by Doxygen .+ -->
+ </div>)
+ (<div class="header">
+   <div class="headertitle">
+ )<div class="title">(.*)</div>  </div>(.*)()
+-</div>
++</div>(?:<!--header-->)?
+ <div class="contents">''')
+ 
+ mainHeadingReplacement = '''\\1
+@@ -149,7 +149,7 @@ def processFile(fileName):
+     f.close()
+ 
+ files = glob.glob(path + '/*.html')  # use given path to files
+-#files = glob.glob('../doc/vigra/index.html')
++#files = glob.glob(path + '/index.html')
+ 
+ for file in files:
+    processFile(file)
+-- 
+1.8.1.6
+
diff --git a/media-libs/vigra/vigra-1.8.0-r1.ebuild b/media-libs/vigra/vigra-1.8.0-r1.ebuild
index 595eb13d8034..dcafc2e233fc 100644
--- a/media-libs/vigra/vigra-1.8.0-r1.ebuild
+++ b/media-libs/vigra/vigra-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v 1.1 2013/04/12 07:52:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.8.0-r1.ebuild,v 1.2 2013/04/28 15:42:20 grozin Exp $
 
 EAPI=5
 
@@ -56,7 +56,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-automagicness.patch \
 		"${FILESDIR}"/${P}-numpy_doc.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-doxygen.patch
 
 	# Don't build nor install API docs when not requested
 	use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }