diff options
author | 2010-02-08 19:21:52 +0000 | |
---|---|---|
committer | 2010-02-08 19:21:52 +0000 | |
commit | f59f63af9031f5b360dac95323fb21085e29b6b8 (patch) | |
tree | 3e43a49c1f855c578a53378e2a361b9032578037 /app-doc/doxygen | |
parent | non-maintainer version bump at upstream's request (diff) | |
download | gentoo-2-f59f63af9031f5b360dac95323fb21085e29b6b8.tar.gz gentoo-2-f59f63af9031f5b360dac95323fb21085e29b6b8.tar.bz2 gentoo-2-f59f63af9031f5b360dac95323fb21085e29b6b8.zip |
Bump to EAPI=3, add prefix support/keywords/patch
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'app-doc/doxygen')
-rw-r--r-- | app-doc/doxygen/ChangeLog | 6 | ||||
-rw-r--r-- | app-doc/doxygen/doxygen-1.6.1.ebuild | 25 | ||||
-rw-r--r-- | app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch | 78 |
3 files changed, 95 insertions, 14 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/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 |