added patches for bugs 129142, 121770, and 129560

Package-Manager: portage-2.1_pre10-r2

7 files changed, 36 insertions, 6 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 9fdc6ee82a2c..51396dcbd957 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.97 2006/04/09 00:33:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.98 2006/05/08 00:17:47 nerdboy Exp $
+
+  08 May 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/1.4.6/01_all_cp1251.patch, +files/1.4.6/03_all_segfault.patch,
+  -files/doxygen-1.4.6-freebsd.patch, +files/1.4.6/02_all_freebsd.patch,
+  +files/1.4.6/04_amd64_qtools.patch,
+  +files/1.4.6/05_all_system-libpng.patch, +files/1.4.6/06_all_qtools.patch,
+  doxygen-1.4.6.ebuild:
+  Added patches for bugs 129142, 121770, and 129560, and consolidated 1.4.6
+  patches in subdir.
 
   08 Apr 2006; Steve Arnold <nerdboy@gentoo.org> doxygen-1.4.2.ebuild,
   doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
diff --git a/app-doc/doxygen/doxygen-1.4.6.ebuild b/app-doc/doxygen/doxygen-1.4.6.ebuild
index 1b556b6538fa..13635b6fcc2c 100644
--- a/app-doc/doxygen/doxygen-1.4.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.5 2006/04/09 00:33:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.6.ebuild,v 1.6 2006/05/08 00:17:47 nerdboy Exp $
 
 inherit eutils toolchain-funcs qt3
 
@@ -22,6 +22,8 @@ RDEPEND=">=media-gfx/graphviz-2.6
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 
+EPATCH_SUFFIX="patch"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -31,8 +33,6 @@ src_unpack() {
 		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
 		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf
 
-	epatch ${FILESDIR}/doxygen-1.4.3-cp1251.patch
-
 	if use unicode; then
 		epatch ${WORKDIR}/${PN}-utf8-ru.patch || die "utf8-ru patch failed"
 	fi
@@ -41,8 +41,9 @@ src_unpack() {
 		epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
 	fi
 
-	# Detect correctly install command on FreeBSD
-	epatch "${FILESDIR}/${P}-freebsd.patch"
+	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
+	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
+	epatch ${FILESDIR}/${PV}
 }
 
 src_compile() {
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.2 b/app-doc/doxygen/files/digest-doxygen-1.4.2
index c7c7a11ff810..91dfa76d5325 100644
--- a/app-doc/doxygen/files/digest-doxygen-1.4.2
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.2
@@ -1,2 +1,6 @@
 MD5 5e0b6c8854c87e06aaca78c81c5236ec doxygen-1.4.2.src.tar.gz 2856998
+RMD160 7cb3102b886a75b67591c56e2610b6755d680195 doxygen-1.4.2.src.tar.gz 2856998
+SHA256 af9ec7c2441abae4f9c85f9b6de5c53c3ec8b04d62a19d75e8c917fc34a56122 doxygen-1.4.2.src.tar.gz 2856998
 MD5 d44ed0c8962329807cee729d1b5b207c doxygen-utf8-ru.patch.gz 14412
+RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 doxygen-utf8-ru.patch.gz 14412
+SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce doxygen-utf8-ru.patch.gz 14412
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.3-r1 b/app-doc/doxygen/files/digest-doxygen-1.4.3-r1
index e891faf3640a..43c9014370da 100644
--- a/app-doc/doxygen/files/digest-doxygen-1.4.3-r1
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.3-r1
@@ -1,2 +1,6 @@
 MD5 6cad81b86c1271777b8ee7c953a496ac doxygen-1.4.3.src.tar.gz 2767795
+RMD160 538eb3a9265e99d92e190c13450b6663ef212ae2 doxygen-1.4.3.src.tar.gz 2767795
+SHA256 1fa21c5739d25aff8151114b7f0718a36a87b44d6956019d29d4d5bcd27cb03f doxygen-1.4.3.src.tar.gz 2767795
 MD5 d44ed0c8962329807cee729d1b5b207c doxygen-utf8-ru.patch.gz 14412
+RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 doxygen-utf8-ru.patch.gz 14412
+SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce doxygen-utf8-ru.patch.gz 14412
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.4 b/app-doc/doxygen/files/digest-doxygen-1.4.4
index 0da9c15580e1..b17374ab35f0 100644
--- a/app-doc/doxygen/files/digest-doxygen-1.4.4
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.4
@@ -1,2 +1,6 @@
 MD5 0e7fdbeafc6264cbde590c363a4debcd doxygen-1.4.4.src.tar.gz 2854374
+RMD160 7999f196b8deb2137e9d411a1c0ea257db32ff3e doxygen-1.4.4.src.tar.gz 2854374
+SHA256 53e7f2e450b86f161dd7d01982967005f1f14ae8f21786dda25e8bb889383d78 doxygen-1.4.4.src.tar.gz 2854374
 MD5 d44ed0c8962329807cee729d1b5b207c doxygen-utf8-ru.patch.gz 14412
+RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 doxygen-utf8-ru.patch.gz 14412
+SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce doxygen-utf8-ru.patch.gz 14412
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.5 b/app-doc/doxygen/files/digest-doxygen-1.4.5
index fb92e8e9bb35..ae91d20a705a 100644
--- a/app-doc/doxygen/files/digest-doxygen-1.4.5
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.5
@@ -1,2 +1,6 @@
 MD5 6319afd44c47a4bcf49658c995322f0e doxygen-1.4.5.src.tar.gz 2884510
+RMD160 9fcc6820b2036e54ecee91650f2470d179d86e2e doxygen-1.4.5.src.tar.gz 2884510
+SHA256 9dca2f306c8ca3dbc576bacf7365dfc5b1e71c0353a6f113351790bae6f35b3d doxygen-1.4.5.src.tar.gz 2884510
 MD5 d44ed0c8962329807cee729d1b5b207c doxygen-utf8-ru.patch.gz 14412
+RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 doxygen-utf8-ru.patch.gz 14412
+SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce doxygen-utf8-ru.patch.gz 14412
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.6 b/app-doc/doxygen/files/digest-doxygen-1.4.6
index d73c9baac709..efead75ba876 100644
--- a/app-doc/doxygen/files/digest-doxygen-1.4.6
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.6
@@ -1,2 +1,6 @@
 MD5 ebf11130bec7987e9b69b1e0301d151a doxygen-1.4.6.src.tar.gz 2889072
+RMD160 00f09e7a6bd2d6e6ed3030a81a41b366b5999c1f doxygen-1.4.6.src.tar.gz 2889072
+SHA256 48ad46bbe03e904fffe0d5012c4f703ad7926951c76e5a2dcb1b447458b2f68c doxygen-1.4.6.src.tar.gz 2889072
 MD5 d44ed0c8962329807cee729d1b5b207c doxygen-utf8-ru.patch.gz 14412
+RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 doxygen-utf8-ru.patch.gz 14412
+SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce doxygen-utf8-ru.patch.gz 14412