Bump to EAPI=3, add prefix support/keywords/patch

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 101 insertions, 19 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 27e773012070..34e333f0cea9 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,10 @@
 # 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.173 2010/01/17 16:31:11 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.174 2010/02/08 19:21:51 abcd Exp $
+
+  08 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
 
   17 Jan 2010; Dominik Kapusta <ayoy@gentoo.org> doxygen-1.5.9.ebuild,
   doxygen-1.6.1.ebuild:
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 9dea6313957c..f30912f0f8d0 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -12,6 +12,7 @@ AUX doxygen-1.5-dot-eps.patch 2247 RMD160 b34b332df8b6769f73613ba11f98b3c5bdee40
 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.6-prefix-misc-alt.patch 2017 RMD160 fba979abf6b0db3c32a1a9509c0a98d7e452a86f SHA1 3bb95cd36289a46d7ba221319421c82e5433e60e SHA256 ee4b8c11c8af9bc3dfb365eff06addf3d7ec73931a234ac3651be2ba28ad3b44
 AUX doxygen-1.5.7.1-substitute.patch 656 RMD160 3730347b9fba4ceef96b6852c164ca4c9037c250 SHA1 e470ee8ede9293cda8ef00d059ca338c725e8523 SHA256 204f140187865c9eb5ca76a421cf1271dfb696858269477468bd605070bd41fd
 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
@@ -32,13 +33,13 @@ EBUILD doxygen-1.5.6.ebuild 4499 RMD160 470b6034a63d4bdebd48443b063e6565ba926b01
 EBUILD doxygen-1.5.7.1.ebuild 4726 RMD160 bdd542705abb6c260fd29f6c02f0664979d1c8af SHA1 97513e9b35b7fd410754b587c418a1b5102cf86e SHA256 d8f68d435453a9a34cdfd29044ba999cfdd2f09dee293d9d05f7676a56506850
 EBUILD doxygen-1.5.8-r1.ebuild 5365 RMD160 c7e343b90603436a1650197307a7d1f8f80b2137 SHA1 2b878c6baf31fb3ea0c1b5a8699d3551e844ec9a SHA256 f26e333750ba0da6bd4840597f1a7d1f7d80aebb29d7195c3447e3b68fce59be
 EBUILD doxygen-1.5.9.ebuild 5144 RMD160 d244e60be9c36417a3e769c67b194176b5dee9dd SHA1 4e12937fd29dda8d660cf9bef4dd3791828f77bd SHA256 bdfe3f87de8d0024022fe0d89384bd3eee1f7aea3a53d384e7c439c6a535f883
-EBUILD doxygen-1.6.1.ebuild 5123 RMD160 1a33c017abcb168727c5c49014c30f82e37f91a1 SHA1 e90d1e198b9fdefc88d477e46ed9894119045d36 SHA256 fced10c5ca06b1fd0984a3494bf06781391132a02f0dae070405d3c8db46ecc7
-MISC ChangeLog 29518 RMD160 a930a4ff157f75179bdafb157cf31150168f25f5 SHA1 fe2c547e7eb235132abb45da60337f6935b609f2 SHA256 5c7c275edb50dd49a0330ee8e33275105a5f08380827959b1ebc5c03b18662b5
+EBUILD doxygen-1.6.1.ebuild 5338 RMD160 57de63321a37fe5edda3b65cfb7e9fc42fd9cfdc SHA1 4288ce22c04c099ab4f33ddaa854f0caa3c07c25 SHA256 6a9ceab95df22430b405ac12e12be8bf0c89098ee513eb36395ae59c1a1572f9
+MISC ChangeLog 29688 RMD160 adbad11a188df92f9471a8c9527072cc465454fa SHA1 d20de9c622aaf40fc946da7f4408ddcbffc20ce0 SHA256 88aeea7349c3daf2012b5e22c513974a085ef59ef3a1679e939356d5427200f5
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktTO1kACgkQ+CZEqwt+F6ad5wCdEjjquyJER2R3l26XxjFo/1gn
-4GcAn1rMzoSqTvARwsJco0KqbnZope3v
-=BSiK
+iEUEARECAAYFAktwZG4ACgkQOypDUo0oQOrEQgCYi3sOxqXNWgaxZ91oip8KvVfi
+6QCgwaQerzAWmW53Kt6S33K3dfM/M4o=
+=Vu47
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.6.1.ebuild b/app-doc/doxygen/doxygen-1.6.1.ebuild
index 1da95379b391..030840892b15 100644
--- a/app-doc/doxygen/doxygen-1.6.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v 1.3 2010/01/17 16:31:11 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v 1.4 2010/02/08 19:21:51 abcd Exp $
 
-EAPI=2
+EAPI=3
 
 inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
 
 RDEPEND="qt4? ( x11-libs/qt-gui:4 )
@@ -52,6 +52,9 @@ src_prepare() {
 	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
 	epatch "${FILESDIR}/${PN}-1.5-dot-eps.patch"
 
+	# prefix search tools patch, plus OSX fixes
+	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
+
 	# fix final DESTDIR issue
 	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
 		addon/doxywizard/Makefile.in || die "sed 2 failed"
@@ -73,11 +76,7 @@ src_configure() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 
 	local my_conf=""
-	if use debug; then
-		my_conf="--prefix /usr --debug"
-	else
-		my_conf="--prefix /usr"
-	fi
+	use debug && my_conf="--debug"
 
 	export CC="${QMAKE_CC}"
 	export CXX="${QMAKE_CXX}"
@@ -85,16 +84,16 @@ src_configure() {
 	export LINK_SHLIB="${QMAKE_CXX}"
 
 	if use qt4; then
-		export QTDIR="/usr"
+		export QTDIR="${EPREFIX}/usr"
 		einfo "using QTDIR: '$QTDIR'."
-		export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
+		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 ${my_conf} $(use_with qt4 doxywizard) \
+		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
 		|| die 'configure with qt4 failed'
 	else
-		./configure ${my_conf} || die 'configure failed'
+		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
 	fi
 }
 
diff --git a/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch b/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch
new file mode 100644
index 000000000000..04d69e84f808
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch
@@ -0,0 +1,78 @@
+* make sure we always look for tools in the path, no "do it yourself paths"
+
+--- configure
++++ configure
+@@ -169,21 +169,12 @@
+       ;;
+     Darwin:*)
+       f_platform=macosx-c++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     FreeBSD:*)
+       f_platform=freebsd-g++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     HP-UX:*)
+       f_platform=hpux-g++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     IRIX64:*)
+       f_platform=irix-64
+@@ -214,9 +205,6 @@
+       ;;
+     SunOS:5*)
+       f_platform=solaris-g++
+-      if test "$f_insttool" = NO; then
+-        f_insttool=/usr/bin/install
+-      fi
+       ;;
+     ULTRIX:*)
+       f_platform=ultrix-g++
+@@ -311,8 +299,8 @@
+ 
+ echo -n "  Checking for GNU make tool... "
+ if test "$f_make" = NO; then
+-  make_names="gmake make"
+-  make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
++  make_names="make"
++  make_dirs="$bin_dirs"
+   make_prog=NO
+   for i in $make_names; do
+     for j in $make_dirs; do
+@@ -338,8 +326,8 @@
+ 
+ echo -n "  Checking for GNU install tool... "
+ if test "$f_insttool" = NO; then
+-  install_names="ginstall install"
+-  install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
++  install_names="install"
++  install_dirs="$bin_dirs"
+   install_prog=NO
+   install_found=NO
+   for i in $install_names; do
+@@ -397,7 +385,7 @@
+ echo -n "  Checking for perl... "
+ if test "$f_perl" = NO; then
+   perl_names="perl perl5"
+-  perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
++  perl_dirs="$bin_dirs"
+   perl_prog=NO
+   perl_found=NO
+   for i in $perl_names; do
+@@ -550,10 +538,6 @@
+   cat >> .tmakeconfig <<EOF
+     TMAKE_LFLAGS += -non_shared
+ EOF
+-  elif test "$f_platform" = "solaris-cc"; then
+-  cat >> .tmakeconfig <<EOF
+-    TMAKE_LFLAGS += -Bstatic
+-EOF
+   elif test "$f_platform" = "hpux-cc"; then
+   cat >> .tmakeconfig <<EOF
+     TMAKE_LFLAGS += -noshared