new version and other fixes for bug 92789, 85668, and 89075.

Package-Manager: portage-2.0.51.19

6 files changed, 152 insertions, 27 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 2e9f7e04ff29..1c3194715ba8 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.68 2005/05/15 17:52:00 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.69 2005/05/30 04:23:40 nerdboy Exp $
+
+*doxygen-1.4.3 (30 May 2005)
+
+  30 May 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/doxygen-1.4.3-cp1251.patch, doxygen-1.4.2.ebuild,
+  +doxygen-1.4.3.ebuild:
+  new version for bug 92789, patch for bug 85668, and stable bumps on 
+  covered arches. Also added brute-force workaround for bug 89075.
 
   15 May 2005; Fernando J. Pereda <ferdy@gentoo.org> doxygen-1.4.1.ebuild:
   alpha stable
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index e86958e5d864..1027c8cb86c0 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,29 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9cd262b18fdbcd3a6572c7c98e6d93e1 doxygen-1.3.7.ebuild 2848
-MD5 b4cd47956731c649190d94a7aff95074 doxygen-1.4.2.ebuild 2677
-MD5 29a6b2395128da940c17fd328243743b doxygen-1.3.6.ebuild 2840
+MD5 85fceaf32d375ac88f44ba93aa7ac2d4 ChangeLog 10754
 MD5 9ef637cc26678b0b489f97f7964aa585 doxygen-1.3.5-r1.ebuild 2843
+MD5 47f312e20d1ef5d335af60f5ec42afbe doxygen-1.3.5.ebuild 2520
+MD5 29a6b2395128da940c17fd328243743b doxygen-1.3.6.ebuild 2840
+MD5 9cd262b18fdbcd3a6572c7c98e6d93e1 doxygen-1.3.7.ebuild 2848
+MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
 MD5 26fca26df565d9fbe59063c2c336103a doxygen-1.3.8.ebuild 2850
-MD5 79711c48356fec9442551a4a866da737 doxygen-1.4.1.ebuild 2668
 MD5 c85273346af476d6a8e8025de5f18f25 doxygen-1.3.9.1.ebuild 2587
-MD5 e990292e8a403e10a39ea9ba2f7c2b49 ChangeLog 10450
-MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
-MD5 47f312e20d1ef5d335af60f5ec42afbe doxygen-1.3.5.ebuild 2520
+MD5 79711c48356fec9442551a4a866da737 doxygen-1.4.1.ebuild 2668
+MD5 43cb16aa07abfc8143ce0477a3430eb6 doxygen-1.4.2.ebuild 2652
+MD5 de9c1ddf8652a6d9b1899b38cece4e04 doxygen-1.4.3.ebuild 2715
 MD5 6fbdec5b9c246aad6da7d0e897fc88c0 files/digest-doxygen-1.3.5 70
+MD5 6fbdec5b9c246aad6da7d0e897fc88c0 files/digest-doxygen-1.3.5-r1 70
 MD5 ad1b465c01ce64583c79c9ff8704a1db files/digest-doxygen-1.3.6 70
 MD5 df3a9ba1fcea84b8601e1175a21de969 files/digest-doxygen-1.3.7 70
 MD5 6cb85b7786622aeda41b6d098c09798e files/digest-doxygen-1.3.8 70
+MD5 6edbf7e40e4dca10e164fe9c79b61b92 files/digest-doxygen-1.3.9.1 72
 MD5 778ad1b1e1d3478ce3798d457fc44a7d files/digest-doxygen-1.4.1 70
-MD5 b48fe99d1b1e8929f752daedeb56ed5c files/digest-doxygen-1.4.2 70
 MD5 0c3111e09b7ea538f06a0655e7898e38 files/bsd-configure.patch 504
-MD5 6edbf7e40e4dca10e164fe9c79b61b92 files/digest-doxygen-1.3.9.1 72
-MD5 6fbdec5b9c246aad6da7d0e897fc88c0 files/digest-doxygen-1.3.5-r1 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCh4xgViELBEf1JB0RAocGAJ9PU0/wJdbwdu3QwEb6+VHKSR8BHgCfScLV
-QTy4iXXVMwdSONUz8SEIzsU=
-=MPYy
------END PGP SIGNATURE-----
+MD5 b48fe99d1b1e8929f752daedeb56ed5c files/digest-doxygen-1.4.2 70
+MD5 3eae39cd24982cc69c7ca5a767b1157c files/doxygen-1.4.3-cp1251.patch 683
+MD5 16a84c6342d0f6132416d398bb1a36f3 files/digest-doxygen-1.4.3 70
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
index c2610afbcb92..5b4154ae35f0 100644
--- a/app-doc/doxygen/doxygen-1.4.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.1 2005/04/02 21:47:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.2 2005/05/30 04:23:40 nerdboy Exp $
 
 inherit eutils
 
@@ -10,15 +10,14 @@ SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~ppc-macos"
 IUSE="doc qt tetex"
 
-RDEPEND="media-gfx/graphviz
+DEPEND="media-gfx/graphviz
 	qt? ( x11-libs/qt )
 	doc? ( tetex? ( virtual/tetex )
-	virtual/ghostscript )"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
+	virtual/ghostscript )
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-doc/doxygen/doxygen-1.4.3.ebuild b/app-doc/doxygen/doxygen-1.4.3.ebuild
new file mode 100644
index 000000000000..96a2d5b13311
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.4.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3.ebuild,v 1.1 2005/05/30 04:23:40 nerdboy Exp $
+
+inherit eutils
+
+DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="doc qt tetex"
+
+RDEPEND="media-gfx/graphviz
+	qt? ( x11-libs/qt )
+	doc? ( tetex? ( virtual/tetex )
+	virtual/ghostscript )"
+DEPEND=">=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# use CFLAGS and CXXFLAGS
+	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
+		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
+		tmake/lib/linux-g++/tmake.conf
+	epatch ${FILESDIR}/${P}-cp1251.patch
+	use ppc-macos && epatch ${FILESDIR}/bsd-configure.patch
+}
+
+src_compile() {
+	# set ./configure options (prefix, Qt based wizard, docdir)
+	local confopts="--prefix ${D}/usr"
+	use qt && confopts="${confopts} --with-doxywizard"
+
+	# ./configure and compile
+	./configure ${confopts} || die '"./configure" failed.'
+	make DESTDIR="${D}" all || die '"make all" 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 tetex; then
+			addwrite /var/cache/fonts
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make docs" failed.'
+		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
+			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
+				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+				-e "s/@sed/# @sed/" doc/Makefile
+			make docs || ewarn '"make docs" failed.'
+		fi
+	fi
+}
+
+src_install() {
+	make install || die '"make install" failed.'
+
+	dodoc INSTALL LANGUAGE.HOWTO LICENSE README VERSION
+
+	# pdf and html manuals
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		if use tetex; then
+			doins latex/doxygen_manual.pdf
+		fi
+		dohtml -r html/*
+	fi
+}
+
+pkg_postinst() {
+
+	ewarn ""
+	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "the html and pdf documentation, respectively.  For examples"
+	einfo "and other goodies, see the source tarball.  For some example"
+	einfo "output, run doxygen on the doxygen source using the Doxyfile"
+	einfo "provided in the top-level source dir."
+	ewarn ""
+}
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.3 b/app-doc/doxygen/files/digest-doxygen-1.4.3
new file mode 100644
index 000000000000..5c80d3c93767
--- /dev/null
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.3
@@ -0,0 +1 @@
+MD5 6cad81b86c1271777b8ee7c953a496ac doxygen-1.4.3.src.tar.gz 2767795
diff --git a/app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch b/app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch
new file mode 100644
index 000000000000..0ffed14733e1
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.4.3-cp1251.patch
@@ -0,0 +1,35 @@
+--- qtools/qtextcodec.cpp.orig	2003-12-14 14:00:57.000000000 -0800
++++ qtools/qtextcodec.cpp	2005-05-29 19:13:17.000000000 -0700
+@@ -1321,7 +1321,7 @@
+ 
+ 
+ 
+-#ifndef QT_NO_CODECS
++// #ifndef QT_NO_CODECS
+ 
+ class QSimpleTextCodec: public QTextCodec
+ {
+@@ -1948,7 +1948,7 @@
+ }
+ 
+ 
+-#endif // QT_NO_CODECS
++// #endif // QT_NO_CODECS
+ 
+ class QLatin1Codec: public QTextCodec
+ {
+@@ -2048,12 +2048,13 @@
+ {
+     (void)new QLatin1Codec;
+ 
+-#ifndef QT_NO_CODECS
++
+     int i = 0;
+     do {
+         (void)new QSimpleTextCodec( i );
+     } while( unicodevalues[i++].mib != LAST_MIB );
+ 
++#ifndef QT_NO_CODECS
+     (void)new QEucJpCodec;
+     (void)new QSjisCodec;
+     (void)new QJisCodec;