Add flex dependency.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64

3 files changed, 59 insertions, 45 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index f43f4aa0ef81..8ff0c1fbada4 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.153 2008/11/02 21:16:57 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.154 2008/11/04 09:49:03 flameeyes Exp $
+
+  04 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> doxygen-1.5.7.1.ebuild:
+  Add flex dependency.
 
 *doxygen-1.5.7.1 (02 Nov 2008)
 
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index e9adc442e1eb..2e9fba7237ae 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.4.7/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 AUX 1.4.7/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9
 AUX 1.4.7/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2
@@ -20,6 +23,13 @@ EBUILD doxygen-1.4.7.ebuild 4161 RMD160 01bb1a92077fd72ce6cb687aa97990f9164172b6
 EBUILD doxygen-1.5.4.ebuild 5206 RMD160 fc46e07ed6b9fdd4d987df48a1a9cc86c9774f43 SHA1 de238baf5fbcc2131aec5001a1ec56d489f99d7a SHA256 268d07fe89f7e6dc7a034ffb682a1ec3084383c6e40f9c869b06a16852a0c3e2
 EBUILD doxygen-1.5.5.ebuild 5252 RMD160 0f0cb0e87142722e62143fc3baa75665afaedbcb SHA1 f283652f15a7cfaa1d14125dcc7ada0752a8dfcf SHA256 694ccc2a1386c7b9aa2e4831428ddfb6640b25be2e439730d4c7c982da4b63a8
 EBUILD doxygen-1.5.6.ebuild 5252 RMD160 1a245f30d3cf2d0fc74776eb01d649f96f8222d0 SHA1 8cf3db42b337085f9c2cff9d3478b87b3a1a5c61 SHA256 22d7978852553f6ea86f02b0e951cb436446207c2a77bf1e96acfcd37ad85023
-EBUILD doxygen-1.5.7.1.ebuild 5423 RMD160 b18326d87bf821250d40f7552227edbd1299dcfa SHA1 714aaeaed1aa7ed71aa5524d8418a6a3c76e3f0c SHA256 f633b04f09f0f79587b6cdf031bd9d0837c09b4a46a50687c82e297763eaac20
-MISC ChangeLog 25930 RMD160 1577346928745c2e00920e0929c6b463a418e779 SHA1 dad717b22f3ca3d1d3ab4917ed3f28701cddea80 SHA256 4dc092f0075663cd0b110bdc94178f49c2ac53ab0b6496bb4cc915db962a975c
+EBUILD doxygen-1.5.7.1.ebuild 5318 RMD160 57bae61e35318d5f87ba2325c5e8f917dbe32014 SHA1 96c76691e29ac38b3d389ad43ed332c143643539 SHA256 a6284e646e8826a632a28264b8031e3cd191b3c15598981dc8b2bdf120689964
+MISC ChangeLog 26033 RMD160 9c994eb37959cc578edbbea0bdf2986040dd8b03 SHA1 2d98f142cd2c7fae2785993ee63bcd2d153adbb4 SHA256 2243c854d579483fa8d1000379cda2f930f3383510a02f980a63777c9d9480ef
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkQGpUACgkQAiZjviIA2XgwVQCfUNtTkIAJV/HkIpaEeviFshZt
++uQAoMPcmN8FbD7JB7pQxJ3IP5TBc2sX
+=LGOQ
+-----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.5.7.1.ebuild b/app-doc/doxygen/doxygen-1.5.7.1.ebuild
index 98df9c76fc90..941cc09b5427 100644
--- a/app-doc/doxygen/doxygen-1.5.7.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.1 2008/11/02 21:16:57 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.2 2008/11/04 09:49:03 flameeyes Exp $
 
 EAPI=1
 
@@ -31,6 +31,7 @@ RDEPEND="qt3? ( x11-libs/qt:3 )
 	!nodot? ( >=media-gfx/graphviz-2.6
 		media-libs/freetype )"
 DEPEND=">=sys-apps/sed-4
+	sys-devel/flex
 	${RDEPEND}"
 
 EPATCH_SUFFIX="patch"
@@ -41,16 +42,16 @@ src_unpack() {
 
 	# use CFLAGS, CXXFLAGS, LDFLAGS
 	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-	    -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-	    -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-	    tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-	    || die "sed failed"
+		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
+		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
+		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
+		|| die "sed failed"
 
 	# Ensure we link to -liconv
 	if use elibc_FreeBSD; then
-	    for pro in */*.pro.in */*/*.pro.in; do
+		for pro in */*.pro.in */*/*.pro.in; do
 		echo "unix:LIBS += -liconv" >> "${pro}"
-	    done
+		done
 	fi
 
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
@@ -61,22 +62,22 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
 
 	if [ $(get_libdir) == "lib64" ] ; then
-	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
 	fi
 
 	# fix final DESTDIR issue
 	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-	    addon/doxywizard/Makefile.in || die "sed failed"
+		addon/doxywizard/Makefile.in || die "sed failed"
 
 	if is-flagq "-O3" ; then
-	    echo
-	    ewarn "Compiling with -O3 is known to produce incorrectly"
-	    ewarn "optimized code which breaks doxygen."
-	    echo
-	    epause 6
-	    elog "Continuing with -O2 instead ..."
-	    echo
-	    replace-flags "-O3" "-O2"
+		echo
+		ewarn "Compiling with -O3 is known to produce incorrectly"
+		ewarn "optimized code which breaks doxygen."
+		echo
+		epause 6
+		elog "Continuing with -O2 instead ..."
+		echo
+		replace-flags "-O3" "-O2"
 	fi
 }
 
@@ -86,52 +87,52 @@ src_compile() {
 
 	local my_conf=""
 	if use debug; then
-	    my_conf="--prefix /usr --debug"
+		my_conf="--prefix /usr --debug"
 	else
-	    my_conf="--prefix /usr"
+		my_conf="--prefix /usr"
 	fi
 
 	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
-	    export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) \
+		einfo "using QTDIR: '$QTDIR'."
+		export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
+		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
+		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
+		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
+		./configure ${my_conf} $(use_with qt3 doxywizard) \
 		|| die 'configure with qt3 failed'
 	else
-	    ./configure ${my_conf} || die 'configure failed'
+		./configure ${my_conf} || die 'configure failed'
 	fi
 
 	# and compile
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
+		LINK_SHLIB="$(tc-getCXX)" 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
+		if use nodot; then
 		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-		    {Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
-	    fi
-	    if use latex; then
+			{Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
+		fi
+		if use latex; then
 		addwrite /var/cache/fonts
 		addwrite /var/cache/fontconfig
 		addwrite /usr/share/texmf/fonts/pk
 		addwrite /usr/share/texmf/ls-R
 		make pdf || ewarn '"make pdf docs" failed.'
-	    else
+		else
 		cp doc/Doxyfile doc/Doxyfile.orig
 		cp doc/Makefile doc/Makefile.orig
 		sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-		    doc/Doxyfile
+			doc/Doxyfile
 		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-		    -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-		    -e "s/@sed/# @sed/" doc/Makefile
+			-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+			-e "s/@sed/# @sed/" doc/Makefile
 		make docs || ewarn '"make html docs" failed.'
-	    fi
+		fi
 	fi
 }
 
@@ -140,8 +141,8 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt3; then
-	    doicon "${FILESDIR}/doxywizard.png"
-	    make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+		doicon "${FILESDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 		"doxywizard.png" "Application;Development"
 	fi
 
@@ -149,11 +150,11 @@ src_install() {
 
 	# pdf and html manuals
 	if use doc; then
-	    insinto /usr/share/doc/"${PF}"
-	    if use latex; then
+		insinto /usr/share/doc/"${PF}"
+		if use latex; then
 		doins latex/doxygen_manual.pdf
-	    fi
-	    dohtml -r html/*
+		fi
+		dohtml -r html/*
 	fi
 }