ohnobinki_overlay Changeset - 9c1f3a9d634b

Changeset - 9c1f3a9d634b

Parent rev.

Child rev.

[Not reviewed]

default

2 3 1

Nathan Brink (binki) - 15 years ago 2010-09-24 18:40:16
ohnobinki@ohnopublishing.net

app-doc/doxygen: Forward-port qconf workaround for portage-multilib users. Add missing patches and drop some unused ones.

(Portage version: 2.2_rc69-r1/hg/Linux x86_64, signed Manifest commit)

6 files changed with 88 insertions and 44 deletions:

app-doc/doxygen/ChangeLog

app-doc/doxygen/Manifest

app-doc/doxygen/doxygen-1.7.1.ebuild

app-doc/doxygen/files/bsd-configure.patch

app-doc/doxygen/files/doxygen-1.7.1-dot-eps.patch

app-doc/doxygen/files/doxygen-gcc4.patch

0 comments (0 inline, 0 general)

app-doc/doxygen/ChangeLog

➞

Show inline comments

 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.174 2010/02/08 19:21:51 abcd Exp $
 Sep 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> +files/doxygen-1.7.1-dot-eps.patch,
   -files/bsd-configure.patch, -files/doxygen-gcc4.patch,
   doxygen-1.7.1.ebuild:
   Forward-port qconf workaround for portage-multilib users. Add missing
   patches and drop some unused ones.
 Sep 2010; Nathan Phillip Brink (ohnobinki)
   <ohnobinki@ohnopublishing.net> +doxygen-1.7.1.ebuild:
   Import app-doc/doxyugen-1.7.1 so that I might forward-port my multilib
   fixes.
 Feb 2010; Jonathan Callen <abcd@gentoo.org>
   +files/doxygen-1.5.6-prefix-misc-alt.patch, doxygen-1.6.1.ebuild:
   Bump to EAPI=3, add prefix support/keywords/patch
 Jan 2010; Dominik Kapusta <ayoy@gentoo.org> doxygen-1.5.9.ebuild,
   doxygen-1.6.1.ebuild:
   Ported to qt4-r2 eclass + switched to EAPI="2" for 1.5.9

app-doc/doxygen/Manifest

➞

Show inline comments

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 AUX bsd-configure.patch 504 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 SHA1 df68c4be15c41b02c822364b5f54214ce65b3fc0 SHA256 8aa47622750701cd492b35e8037b3b8a5ed1c13e564d0a0081a09877717b9cf1
 AUX doxygen-1.5-dot-eps.patch 2247 RMD160 b34b332df8b6769f73613ba11f98b3c5bdee40c6 SHA1 ab5c78d0599661e82a9ac1f4bf0117318e54712e SHA256 6dc47978298a39bc520a1f48206be26f76657842f14aba3413768352c7e87d45
 AUX doxygen-1.5-legacy-patches.diff 7242 RMD160 0100a2305101b392764eaf867a32e0d14dcf9208 SHA1 bb564532f157e72436e0c8ecbbed163d96db3674 SHA256 f696c10fe571d281ed8178e7a07864c7a5bba9cc21ac723ee9669ac32e43e114
 AUX doxygen-1.5-system-libpng.patch 5332 RMD160 cfa7709a0f867609cf149407d19df2ecf53af750 SHA1 9b0547b64fd9b15406a72b18fe19673f784c50f9 SHA256 5800013e75e3fdb4a6dbc513a25393ec9cef0dfa412032c1c3de562829ddaeab
 AUX doxygen-1.5.6-prefix-misc-alt.patch 2017 RMD160 fba979abf6b0db3c32a1a9509c0a98d7e452a86f SHA1 3bb95cd36289a46d7ba221319421c82e5433e60e SHA256 ee4b8c11c8af9bc3dfb365eff06addf3d7ec73931a234ac3651be2ba28ad3b44
 AUX doxygen-1.5.8-kdedocs.patch 854 RMD160 945e07ab7f5f168d63f5a99423a56d9b12477df8 SHA1 5e987c64b95500441a668fd4912db32714de495d SHA256 48703fc843633e774e05c64e6903badfd74f456f7099399d44b3150f9b964e6c
-AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1 ac7ed139251d87876e67b3e5ce04652b3ac27795 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce
+AUX doxygen-1.7.1-dot-eps.patch 1359 RMD160 588347d4145638e6309395b8ad7cb4f441fc61ef SHA1 7b6ef31f3e1bc0835f8f9ffcc28d965cbf2d99aa SHA256 d45f040844707d439ee738f03ad81469df15cf14444f701fadf7eb97898771fd
 AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
 DIST doxygen-1.5.8.src.tar.gz 4125837 RMD160 e392cd00960c4036661c8cda3ec6bc6ee3fe300c SHA1 a55b1c41417be8acb3ac5e1553a711ffa437cba2 SHA256 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8
 DIST doxygen-1.5.9.src.tar.gz 4141375 RMD160 51d79c0f8846f47e9aa8c37cd0eb9db630491885 SHA1 6211b850bdaa2198e35546e4299a27774c957ece SHA256 89c3d1102e9e5c63ff735dee88b595bc986fbb2b5944b28ba5f91d31adf8958e
 DIST doxygen-1.6.1.src.tar.gz 3902407 RMD160 0a9c5962dbd076bac418b85b72a4874576c9da4d SHA1 31f861841eba1ebdded1b4bf70bdecb42441dafd SHA256 4c5aedf052a14a0f7fe8c126140ff1c5c50887c74814a4804181c61625d539d3
 DIST doxygen-1.7.1.src.tar.gz 4116363 RMD160 83187765052258078afb0959b80524f703c20cd7 SHA1 fca75d70f48ef0def276fd8db495772f6c43f862 SHA256 4b866f3b194970d7e0768944255d89b0a1aae7bf337f5ae3e4b8358da349da31
 EBUILD doxygen-1.5.8-r1.ebuild 5595 RMD160 27f83c683eccbe835d0639e3d72f9382c175270c SHA1 c0346fdc2ed0f609a901b77794de063960f54c53 SHA256 97db981432bd0c0432a11ccc272f0b51913869d1ebc73a4e99da1d0e16fdf375
 EBUILD doxygen-1.5.9.ebuild 5393 RMD160 3b0fcfb62e47acc69a88012c572096aaf7d8a01e SHA1 699126289a600197b6c0768f06979c9afdcd7c01 SHA256 a4893be42a65463170f70d0275ed54db72a056dfc61a50171dfdbc0f395a4a4d
 EBUILD doxygen-1.6.1.ebuild 5587 RMD160 96c5af4fffd4300f699f653b1516d5085b5e84b9 SHA1 7f6537e8f73100f4337d916c614f2f450b3cdcc1 SHA256 6702116e1ad87e711f2e2d863aa702d5a6cf2a0261f17b71509134d0874e0b5d
 EBUILD doxygen-1.7.1.ebuild 5150 RMD160 c41eaadfd7d3a55e9819d5d1fdd834057ea662ee SHA1 bd1de38b765f1e5db61617d65643cc6f585a64b9 SHA256 39a38a458eb2eef27068de1a5acc91f1c9285eadff1d0100c32f41b6c36b8218
 MISC ChangeLog 29875 RMD160 e1b8e02c2b5f600812aebf26dd1fa59e11e54806 SHA1 0455a57c97b5eca56388d50547bc81aba6204b1d SHA256 fc0ae44e3b986766d57775cecc639d760804ecda583a204efe5c4099215066a1
 EBUILD doxygen-1.7.1.ebuild 5399 RMD160 c8de23e82f724d44889eecdaccb363755ca08c12 SHA1 780251184657008d1aaa92dc920d16bcd05004d4 SHA256 543ac8d7660819cda6a14b54278796e4d02faf1248021a7e439e85f8a68e5d2b
 MISC ChangeLog 30183 RMD160 397c5e79a15fc61b3944f52fe8c894670f20b0ef SHA1 76e0c6409cb6536510145872258edc0200d682dd SHA256 46b83030b2e897d73234e8460d774341b66cf0006403975baecf0a09fcfa1a84
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJMnO0SAAoJEHQ6UuhrqBBQfLEP/jZAOWUbsnLQZOOfUjbVBqWq
 EWcjpsbSlj17VXZDulLSjKuiZ6cdjM0N4MlrNfPA3TUdPKjVAPBQE0K/jCivuyc6
 HnKyiv1tuYfuzXD5ibUoBbFux5dRxPa+5YkVGMo6cruFLFV476HI+1YeTtrtOj3R
 j7TwYJYr380S7TK6vwNz+0v/qD/iuR2e1JmRBKt1rBbvPwJzxY+rnxDQE/+/bPUL
 Xyq40cy15d9TOMpikNq5buV9wXF2npi2ggG+whDUb12Fh+tjSxPmXqz5vakPeIyp
 DeC5hkKCCVb0epl5Q2JwPrZbCxTDClSTbSva4XJ8g30RXoZ4xrJz177wD+EuHdgZ
 st9z8xGC82XDxz1EOpmzKOtX7l+g7IEfGK2y1UpXido9yMlKiy+XS+uvIRvP6eh/
 tKH7itC7zMdGrla6bOJGMvhP1AIxZ25ciNeoftVnUoeLVl51+qQFCl7Fc4CstwZL
 kVVA61otvI7vZwgBRREKnJfpt+Rnn5nhlyFOKoDTT2xxAP/BnCz+MbdhOIL2NrsQ
 DzcP3ORNYUy3uvUjMwXnWGthp5jDHyV00K+iDanE/yx0+foFAjtV/pV17AuFJda
 KPMkYBrneeGvui1KPSoaqLOF0bJB4JQ06578IQMGgMIk2VRQK2jt1//g3jHrxhh7
 w1jKqt591wZvkHzZL5+
 =8lRH
 iQIcBAEBCAAGBQJMnSjPAAoJEHQ6UuhrqBBQ3wQP/RLzNMO6WAAftZ86M7p0PIhB
 HxWnbRid0uUXitTmSrlDFO0FNujkYXV6rTX0bB1rPoAOapPk1si61q2FESBBMAd
 lyG/7YKF/EVou6ljTSrDili/PtkTXvy9dONnsh1sWrFFX59zl0y2Y11VO6Xz+aeZ
 uIvZHp65wLmXtQY2wgA+knL+pJZi0ARVkvoDC9ix0UIqfydGTWCVYo1Dc5csDztY
 wwBtzT4oyqfYAMtW+Ppg3Icn7RvI4qx0jSaSs73itbumsG06GtyYjkza8mI/R5h4
 DZAVYbeVv/fWp/3WFc9NjFmfQ/+bVgaKYHgOSWIRb3YFWLMnP6AeE2p7OOKOA9Q/
 F7Xf7qBccS40hdRnokeA2jn+02RWUtDVUZEHnAHqaPOZCnSzpU/g076whQhOLg71
 atCO1so2tU5zE4cFJDHOVndMfV0TvWoyU3WCPcDPhRkSbBmW6yensVjQlmTd8IV3
 g8km41O0AFOwHqp4o04PsqRVDoaNFx6tEG06m7RgE8BBwEK9T7X91yR0EiSMsUt9
 BPWk9n7VD+beoljujJHjbYucjFWK8a74Yr0W8YINPpM9wskcXfIAQuV6XBxf7Db2
 rAjlXBM/Ipaw2OYzq51HmxsJEWj+cVfY7HMK5OMIonwhXoJfMZZJw2qwux/nCyeK
 W+pgSyjSXIojntfQoStX
 =3cLh
 -----END PGP SIGNATURE-----

app-doc/doxygen/doxygen-1.7.1.ebuild

➞

Show inline comments

@@ @@ -81,24 +81,32 @@ src_configure() { @@
 	if use qt4; then
 		export QTDIR="${EPREFIX}/usr"
 		einfo "using QTDIR: '$QTDIR'."
 		export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}"
 		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
 		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
 		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
 		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
 		|| die 'configure with qt4 failed'
 	else
 		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
 	fi
 	if use qt4; then
 		# prevent generated Makefiles from trying to run qmake themselves
 		# by running it ourselves. This feels slightly hacky ;-) --ohnobinki
 		pushd addon/doxywizard || die
 		eqmake4 doxywizard.pro -o Makefile.doxywizard
 		popd
 	fi
+}
 src_compile() {
 	emake all || die 'emake failed'
 	# generate html and pdf (if tetex in use) documents.
 	# errors here are not considered fatal, hence the ewarn message
 	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
 	# so we allow it.
 	if use doc; then
 		if use nodot; then
 			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \

app-doc/doxygen/files/bsd-configure.patch

➞

Show inline comments

deleted file

app-doc/doxygen/files/doxygen-1.7.1-dot-eps.patch

➞

Show inline comments

@@ new file 100644 @@
 diff -ruN doxygen-1.7.0.orig/src/dot.cpp doxygen-1.7.0/src/dot.cpp
 --- doxygen-1.7.0.orig/src/dot.cpp	2010-06-22 16:00:16.043394153 +0800
 +++ doxygen-1.7.0/src/dot.cpp	2010-06-22 16:00:52.509648230 +0800
@@ -2366,7 +2366,7 @@
+       }
        else
+       {
 -        dotRun->addJob("ps",absEpsName);
 +        dotRun->addJob("eps",absEpsName);
+       }
        DotManager::instance()->addRun(dotRun);
+     }
@@ -2662,7 +2662,7 @@
+       }
        else
+       {
 -        dotRun->addJob("ps",absEpsName);
 +        dotRun->addJob("eps",absEpsName);
+       }
        DotManager::instance()->addRun(dotRun);
@@ -2935,7 +2935,7 @@
+       }
        else
+       {
 -        dotRun->addJob("ps",absEpsName);
 +        dotRun->addJob("eps",absEpsName);
+       }
        DotManager::instance()->addRun(dotRun);
@@ -3063,7 +3063,7 @@
+       }
        else
+       {
 -        dotRun->addJob("ps",absEpsName);
 +        dotRun->addJob("eps",absEpsName);
+       }
        DotManager::instance()->addRun(dotRun);
+     }
@@ -3193,7 +3193,7 @@
+     }
      else
+     {
 -      dotRun.addJob("ps",absOutFile+".eps");
 +      dotRun.addJob("eps",absOutFile+".eps");
+     }
+   }
@@ -3552,7 +3552,7 @@
+       }
        else
+       {
 -        dotRun->addJob("ps",absEpsName);
 +        dotRun->addJob("eps",absEpsName);
+       }
        DotManager::instance()->addRun(dotRun);
+     }

app-doc/doxygen/files/doxygen-gcc4.patch

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)