Backported ppc-macos qt fix to version 1.4.2. Changed conditional to userland_Darwin where appropriate.

Package-Manager: portage-2.0.51.21

4 files changed, 28 insertions, 19 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 820be01ad4f1..31ead68f6d7b 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,11 @@
 # 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.78 2005/08/23 03:07:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.79 2005/08/29 18:11:08 j4rg0n Exp $
+
+  29 Aug 2005; Lina Pezzella <j4rg0n@gentoo.org> doxygen-1.4.2.ebuild,
+  doxygen-1.4.3-r1.ebuild:
+  Backported ppc-macos qt fix to version 1.4.2. Changed conditional to
+  userland_Darwin where appropriate.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> doxygen-1.4.2.ebuild:
   stable on ia64
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index ea97397a8fdc..051af2785d71 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,23 +1,23 @@
-MD5 b86c89eba9b11380fb5348035798c9bd doxygen-1.4.1.ebuild 2666
-MD5 1670096ff7b15e9f9d0e81bc0e5989c4 doxygen-1.3.9.1.ebuild 2582
+MD5 0efb21877a8e5ff3d97faca0ffda1e58 ChangeLog 12262
 MD5 1952ebecb1c3659016a2943eb43f7dba doxygen-1.3.5-r1.ebuild 2836
+MD5 910e1c4ce15f5ce878cb2c39c67a21d4 doxygen-1.3.5.ebuild 2519
 MD5 854f0ab25f9564ecb9de05ff62fcdc45 doxygen-1.3.6.ebuild 2834
-MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
 MD5 90dafbbb7d933dea71e0248fed6d882e doxygen-1.3.7.ebuild 2841
-MD5 e3dc3d77c7a664e333c7ae6fb4996340 ChangeLog 12057
-MD5 910e1c4ce15f5ce878cb2c39c67a21d4 doxygen-1.3.5.ebuild 2519
 MD5 2c59f9c8cf3efdec74eea5cc08e00b47 doxygen-1.3.8.ebuild 2848
-MD5 25bdd8deaf311bf3a0d3b41f61001653 doxygen-1.4.2.ebuild 2645
-MD5 df644ab68002bdcc1eba8dfdecc35a12 doxygen-1.4.3-r1.ebuild 2873
-MD5 df3a9ba1fcea84b8601e1175a21de969 files/digest-doxygen-1.3.7 70
-MD5 3eae39cd24982cc69c7ca5a767b1157c files/doxygen-1.4.3-cp1251.patch 683
+MD5 cf200318691ccdabdcdf603792fc907d metadata.xml 447
+MD5 1670096ff7b15e9f9d0e81bc0e5989c4 doxygen-1.3.9.1.ebuild 2582
+MD5 b86c89eba9b11380fb5348035798c9bd doxygen-1.4.1.ebuild 2666
+MD5 d788e9c22d04f1ef29079ba56191622b doxygen-1.4.2.ebuild 2792
+MD5 df3ab9563820a7cb9d65c142eb123a4c doxygen-1.4.3-r1.ebuild 2880
 MD5 6fbdec5b9c246aad6da7d0e897fc88c0 files/digest-doxygen-1.3.5 70
-MD5 6edbf7e40e4dca10e164fe9c79b61b92 files/digest-doxygen-1.3.9.1 72
-MD5 16a84c6342d0f6132416d398bb1a36f3 files/digest-doxygen-1.4.3-r1 70
+MD5 6fbdec5b9c246aad6da7d0e897fc88c0 files/digest-doxygen-1.3.5-r1 70
 MD5 ad1b465c01ce64583c79c9ff8704a1db files/digest-doxygen-1.3.6 70
-MD5 b48fe99d1b1e8929f752daedeb56ed5c files/digest-doxygen-1.4.2 70
-MD5 1473b90cf51c0df70eed324ededc8624 files/doxygen-1.4.3-nls.patch 1019
+MD5 df3a9ba1fcea84b8601e1175a21de969 files/digest-doxygen-1.3.7 70
 MD5 6cb85b7786622aeda41b6d098c09798e files/digest-doxygen-1.3.8 70
-MD5 6fbdec5b9c246aad6da7d0e897fc88c0 files/digest-doxygen-1.3.5-r1 70
+MD5 6edbf7e40e4dca10e164fe9c79b61b92 files/digest-doxygen-1.3.9.1 72
 MD5 778ad1b1e1d3478ce3798d457fc44a7d files/digest-doxygen-1.4.1 70
 MD5 0c3111e09b7ea538f06a0655e7898e38 files/bsd-configure.patch 504
+MD5 b48fe99d1b1e8929f752daedeb56ed5c files/digest-doxygen-1.4.2 70
+MD5 16a84c6342d0f6132416d398bb1a36f3 files/digest-doxygen-1.4.3-r1 70
+MD5 3eae39cd24982cc69c7ca5a767b1157c files/doxygen-1.4.3-cp1251.patch 683
+MD5 1473b90cf51c0df70eed324ededc8624 files/doxygen-1.4.3-nls.patch 1019
diff --git a/app-doc/doxygen/doxygen-1.4.2.ebuild b/app-doc/doxygen/doxygen-1.4.2.ebuild
index b1f584b96ed7..b5e3f6f75057 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.10 2005/08/23 03:07:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.2.ebuild,v 1.11 2005/08/29 18:11:08 j4rg0n Exp $
 
 inherit eutils
 
@@ -26,7 +26,11 @@ 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
-	use ppc-macos && epatch ${FILESDIR}/bsd-configure.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
 }
 
 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 6d6dc7bbc4d3..5094d8fccaaf 100644
--- a/app-doc/doxygen/doxygen-1.4.3-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.3-r1.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.3-r1.ebuild,v 1.5 2005/07/28 20:52:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.3-r1.ebuild,v 1.6 2005/08/29 18:11:08 j4rg0n Exp $
 
 inherit eutils
 
@@ -29,7 +29,7 @@ src_unpack() {
 		tmake/lib/linux-g++/tmake.conf
 	epatch ${FILESDIR}/${P}-cp1251.patch
 	epatch ${FILESDIR}/${P}-nls.patch
-	if use ppc-macos; then
+	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