patched all versions with fixes for bugs 112076 and 113420

(Portage version: 2.1_pre1)

8 files changed, 86 insertions, 21 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index e715f3ce715f..07273db37da6 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,13 @@
 # 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.88 2005/11/24 18:36:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.89 2005/12/21 03:30:53 nerdboy Exp $
+
+  21 Dec 2005; Steve Arnold <nerdboy@gentoo.org> +files/doxygen-gcc4.patch,
+  +files/doxygen-utf8-ru.patch.gz, doxygen-1.4.2.ebuild,
+  doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild:
+  Patched all versions with fixes for bugs 112076 and 113420.  Thanks
+  to Robert Marmorstein <rmmarm@wm.edu> and Sergey Belyashov <b-s-a@narod.ru>
+  for the patches.  Most users unaffected so far...
 
   24 Nov 2005; Markus Rothe <corsair@gentoo.org> doxygen-1.4.4.ebuild:
   Stable on ppc64
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index f95ffa719d8a..bddeeb6aab38 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,14 +1,16 @@
-MD5 c07bcb7203fb060d2d5b8dc3a8b6f4f1 ChangeLog 13927
-MD5 9dc65dab0d568ea903926b28d5bcf273 doxygen-1.4.4.ebuild 2743
-MD5 75cd0b86c4cd27c628f1152f659097fe doxygen-1.4.5.ebuild 2767
-MD5 b9eaac8ad7a41889db03fdfd59b06167 doxygen-1.4.2.ebuild 2822
-MD5 03f4ec6c6bd879079084705815f0f58e doxygen-1.4.3-r1.ebuild 2909
-MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
+MD5 6f21091e91cfdb00104451f1f1fa71f1 ChangeLog 14332
+MD5 fd1ce62c257a667811de83a39c661605 doxygen-1.4.2.ebuild 3060
+MD5 c12a3f8eeefc2218e59984c57a7beee2 doxygen-1.4.3-r1.ebuild 3148
+MD5 f4fa1d034fc08a7cfd464ad544dd4ffa doxygen-1.4.4.ebuild 2981
+MD5 097b0c0376bfa3ef53ba2aea8978d8ee doxygen-1.4.5.ebuild 3005
 MD5 0c3111e09b7ea538f06a0655e7898e38 files/bsd-configure.patch 504
-MD5 d2ecb11525308c4c548e9d94003c3f74 files/digest-doxygen-1.4.4 70
-MD5 2f35d937d20077c4ebaa239d0f9f0306 files/digest-doxygen-1.4.5 70
 MD5 b48fe99d1b1e8929f752daedeb56ed5c files/digest-doxygen-1.4.2 70
 MD5 16a84c6342d0f6132416d398bb1a36f3 files/digest-doxygen-1.4.3-r1 70
+MD5 d2ecb11525308c4c548e9d94003c3f74 files/digest-doxygen-1.4.4 70
+MD5 2f35d937d20077c4ebaa239d0f9f0306 files/digest-doxygen-1.4.5 70
 MD5 3eae39cd24982cc69c7ca5a767b1157c files/doxygen-1.4.3-cp1251.patch 683
 MD5 1473b90cf51c0df70eed324ededc8624 files/doxygen-1.4.3-nls.patch 1019
 MD5 461d2d8b233682be4ea9191058708a77 files/doxygen-1.4.4-darwin.patch 536
+MD5 e143e9d3e25a559233f4f2d77a58290d files/doxygen-gcc4.patch 478
+MD5 d44ed0c8962329807cee729d1b5b207c files/doxygen-utf8-ru.patch.gz 14412
+MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
index 92ddbbdf9a53..c15d577c16a7 100644
--- a/app-doc/doxygen/doxygen-1.4.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.2.ebuild
@@ -1,8 +1,8 @@
 # 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.12 2005/10/20 06:34:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.13 2005/12/21 03:30:53 nerdboy Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -11,7 +11,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 mips ppc ppc-macos ppc64 s390 sparc x86"
-IUSE="doc qt tetex"
+IUSE="doc qt tetex unicode"
 
 DEPEND="media-gfx/graphviz
 	qt? ( =x11-libs/qt-3* )
@@ -26,11 +26,20 @@ src_unpack() {
 	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
+
 	if use userland_Darwin; then
 		epatch ${FILESDIR}/bsd-configure.patch
 		[[ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]] &&  sed -i -e 's:-D__FreeBSD__:-D__FreeBSD__=5:' \
 		tmake/lib/macosx-c++/tmake.conf
 	fi
+
+	if use unicode; then
+		epatch ${FILESDIR}/${PN}-utf8-ru.patch.gz || die "utf8-ru patch failed"
+	fi
+
+	if [ $(gcc-major-version) -eq 4 ] ; then
+		epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
+	fi
 }
 
 src_compile() {
diff --git a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
index 4a8b9a4d94f0..80b6e3833902 100644
--- a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.7 2005/10/20 06:34:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.8 2005/12/21 03:30:53 nerdboy Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -11,7 +11,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 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-macos"
-IUSE="doc qt tetex"
+IUSE="doc qt tetex unicode"
 
 RDEPEND="media-gfx/graphviz
 	qt? ( =x11-libs/qt-3* )
@@ -27,13 +27,23 @@ src_unpack() {
 	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
 	epatch ${FILESDIR}/${P}-nls.patch
+
 	if use userland_Darwin; then
 		epatch ${FILESDIR}/bsd-configure.patch
 		[[ "$MACOSX_DEPLOYMENT_TARGET" == "10.4" ]] && 	sed -i -e 's:-D__FreeBSD__:-D__FreeBSD__=5:' \
 			tmake/lib/macosx-c++/tmake.conf
 	fi
+
+	if use unicode; then
+		epatch ${FILESDIR}/${PN}-utf8-ru.patch.gz || die "utf8-ru patch failed"
+	fi
+
+	if [ $(gcc-major-version) -eq 4 ] ; then
+		epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
+	fi
 }
 
 src_compile() {
diff --git a/app-doc/doxygen/doxygen-1.4.4.ebuild b/app-doc/doxygen/doxygen-1.4.4.ebuild
index 60e53097f35b..2959e19edf2c 100644
--- a/app-doc/doxygen/doxygen-1.4.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.4.ebuild
@@ -1,8 +1,8 @@
 # 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.4.ebuild,v 1.10 2005/11/24 18:36:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.11 2005/12/21 03:30:53 nerdboy Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -11,7 +11,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 mips ppc ~ppc-macos ppc64 s390 sparc x86"
-IUSE="doc qt tetex"
+IUSE="doc qt tetex unicode"
 
 RDEPEND="media-gfx/graphviz
 	qt? ( =x11-libs/qt-3* )
@@ -27,8 +27,17 @@ src_unpack() {
 	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
 		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
 		tmake/lib/{linux-g++,macosx-c++}/tmake.conf
+
 	epatch ${FILESDIR}/doxygen-1.4.3-cp1251.patch
 	epatch ${FILESDIR}/${P}-darwin.patch
+
+	if use unicode; then
+		epatch ${FILESDIR}/${PN}-utf8-ru.patch.gz || die "utf8-ru patch failed"
+	fi
+
+	if [ $(gcc-major-version) -eq 4 ] ; then
+		epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
+	fi
 }
 
 src_compile() {
diff --git a/app-doc/doxygen/doxygen-1.4.5.ebuild b/app-doc/doxygen/doxygen-1.4.5.ebuild
index 5a1883117567..c6e7d5957bae 100644
--- a/app-doc/doxygen/doxygen-1.4.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.5.ebuild
@@ -1,8 +1,8 @@
 # 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.5.ebuild,v 1.1 2005/10/20 06:34:43 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.5.ebuild,v 1.2 2005/12/21 03:30:53 nerdboy Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
 HOMEPAGE="http://www.doxygen.org/"
@@ -11,7 +11,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 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc qt tetex"
+IUSE="doc qt tetex unicode"
 
 RDEPEND="media-gfx/graphviz
 	qt? ( =x11-libs/qt-3* )
@@ -27,8 +27,17 @@ src_unpack() {
 	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
 		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
 		tmake/lib/{linux-g++,macosx-c++}/tmake.conf
+
 	epatch ${FILESDIR}/doxygen-1.4.3-cp1251.patch
 	epatch ${FILESDIR}/doxygen-1.4.4-darwin.patch
+
+	if use unicode; then
+		epatch ${FILESDIR}/${PN}-utf8-ru.patch.gz || die "utf8-ru patch failed"
+	fi
+
+	if [ $(gcc-major-version) -eq 4 ] ; then
+		epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
+	fi
 }
 
 src_compile() {
diff --git a/app-doc/doxygen/files/doxygen-gcc4.patch b/app-doc/doxygen/files/doxygen-gcc4.patch
new file mode 100644
index 000000000000..253914f307d9
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-gcc4.patch
@@ -0,0 +1,19 @@
+*** qtools/qvaluestack.h.old	Wed Nov 23 22:27:00 2005
+--- qtools/qvaluestack.h	Wed Nov 23 22:27:06 2005
+***************
+*** 54,60 ****
+      {
+  	T elem( this->last() );
+  	if ( !this->isEmpty() )
+! 	    remove( this->fromLast() );
+  	return elem;
+      }
+      T& top() { return this->last(); }
+--- 54,60 ----
+      {
+  	T elem( this->last() );
+  	if ( !this->isEmpty() )
+! 	    this->remove( this->fromLast() );
+  	return elem;
+      }
+      T& top() { return this->last(); }
diff --git a/app-doc/doxygen/files/doxygen-utf8-ru.patch.gz b/app-doc/doxygen/files/doxygen-utf8-ru.patch.gz
new file mode 100644
index 000000000000..b76601208950
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-utf8-ru.patch.gz