| 1 |
abcd 10/02/08 19:21:52 |
| 2 |
|
| 3 |
Modified: ChangeLog doxygen-1.6.1.ebuild |
| 4 |
Log: |
| 5 |
Bump to EAPI=3, add prefix support/keywords/patch |
| 6 |
(Portage version: -svn/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.174 app-doc/doxygen/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.174&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?rev=1.174&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/ChangeLog?r1=1.173&r2=1.174 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v |
| 18 |
retrieving revision 1.173 |
| 19 |
retrieving revision 1.174 |
| 20 |
diff -u -r1.173 -r1.174 |
| 21 |
--- ChangeLog 17 Jan 2010 16:31:11 -0000 1.173 |
| 22 |
+++ ChangeLog 8 Feb 2010 19:21:51 -0000 1.174 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for app-doc/doxygen |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.173 2010/01/17 16:31:11 ayoy Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.174 2010/02/08 19:21:51 abcd Exp $ |
| 28 |
+ |
| 29 |
+ 08 Feb 2010; Jonathan Callen <abcd@g.o> |
| 30 |
+ +files/doxygen-1.5.6-prefix-misc-alt.patch, doxygen-1.6.1.ebuild: |
| 31 |
+ Bump to EAPI=3, add prefix support/keywords/patch |
| 32 |
|
| 33 |
17 Jan 2010; Dominik Kapusta <ayoy@g.o> doxygen-1.5.9.ebuild, |
| 34 |
doxygen-1.6.1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 app-doc/doxygen/doxygen-1.6.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: doxygen-1.6.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- doxygen-1.6.1.ebuild 17 Jan 2010 16:31:11 -0000 1.3 |
| 51 |
+++ doxygen-1.6.1.ebuild 8 Feb 2010 19:21:51 -0000 1.4 |
| 52 |
@@ -1,8 +1,8 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v 1.3 2010/01/17 16:31:11 ayoy Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v 1.4 2010/02/08 19:21:51 abcd Exp $ |
| 57 |
|
| 58 |
-EAPI=2 |
| 59 |
+EAPI=3 |
| 60 |
|
| 61 |
inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime |
| 62 |
|
| 63 |
@@ -12,7 +12,7 @@ |
| 64 |
|
| 65 |
LICENSE="GPL-2" |
| 66 |
SLOT="0" |
| 67 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 68 |
+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" |
| 69 |
IUSE="debug doc nodot qt4 latex elibc_FreeBSD" |
| 70 |
|
| 71 |
RDEPEND="qt4? ( x11-libs/qt-gui:4 ) |
| 72 |
@@ -52,6 +52,9 @@ |
| 73 |
# Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
| 74 |
epatch "${FILESDIR}/${PN}-1.5-dot-eps.patch" |
| 75 |
|
| 76 |
+ # prefix search tools patch, plus OSX fixes |
| 77 |
+ epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch |
| 78 |
+ |
| 79 |
# fix final DESTDIR issue |
| 80 |
sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \ |
| 81 |
addon/doxywizard/Makefile.in || die "sed 2 failed" |
| 82 |
@@ -73,11 +76,7 @@ |
| 83 |
# set ./configure options (prefix, Qt based wizard, docdir) |
| 84 |
|
| 85 |
local my_conf="" |
| 86 |
- if use debug; then |
| 87 |
- my_conf="--prefix /usr --debug" |
| 88 |
- else |
| 89 |
- my_conf="--prefix /usr" |
| 90 |
- fi |
| 91 |
+ use debug && my_conf="--debug" |
| 92 |
|
| 93 |
export CC="${QMAKE_CC}" |
| 94 |
export CXX="${QMAKE_CXX}" |
| 95 |
@@ -85,16 +84,16 @@ |
| 96 |
export LINK_SHLIB="${QMAKE_CXX}" |
| 97 |
|
| 98 |
if use qt4; then |
| 99 |
- export QTDIR="/usr" |
| 100 |
+ export QTDIR="${EPREFIX}/usr" |
| 101 |
einfo "using QTDIR: '$QTDIR'." |
| 102 |
- export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}" |
| 103 |
- export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}" |
| 104 |
+ export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}" |
| 105 |
+ export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" |
| 106 |
einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'." |
| 107 |
einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'." |
| 108 |
- ./configure ${my_conf} $(use_with qt4 doxywizard) \ |
| 109 |
+ ./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \ |
| 110 |
|| die 'configure with qt4 failed' |
| 111 |
else |
| 112 |
- ./configure ${my_conf} || die 'configure failed' |
| 113 |
+ ./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed' |
| 114 |
fi |
| 115 |
} |
Archives