ppc-macos keyword and patch dropped

Package-Manager: portage-2.1.3.9

6 files changed, 28 insertions, 63 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index cd0b792f93cd..6ae3f2fd9120 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.115 2007/08/16 15:06:56 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.116 2007/09/15 07:30:31 uberlord Exp $
+
+  15 Sep 2007; Roy Marples <uberlord@gentoo.org>
+  -files/openvpn-2.0.4-darwin.patch, openvpn-2.0.6.ebuild,
+  openvpn-2.0.7-r2.ebuild, openvpn-2.1_rc4-r2.ebuild:
+  ppc-macos keyword and patch dropped
 
 *openvpn-2.1_rc4-r2 (16 Aug 2007)
 
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 4006e58292f9..4791bab217e7 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -2,10 +2,6 @@ AUX down.sh 855 RMD160 0fed7862ed257e13ee93a9c29750eb26c4b83e68 SHA1 e14110015b8
 MD5 c777a06955c64fe15f78a9a456abe13b files/down.sh 855
 RMD160 0fed7862ed257e13ee93a9c29750eb26c4b83e68 files/down.sh 855
 SHA256 b06bdbc9b8f9d3b4575fd20f69792625f1b65fcae0d92ad904778bdfb84a7457 files/down.sh 855
-AUX openvpn-2.0.4-darwin.patch 717 RMD160 66aa5ea349329cf3e6089aa75eb7c80e0d21063b SHA1 ca21fbc61b78d893699b6bf4fb40eb2735db28c8 SHA256 ad70b77c10bb57a07af3d512e953fc8b5a07108df5bf9795e0cb12e1ba2b2136
-MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
-RMD160 66aa5ea349329cf3e6089aa75eb7c80e0d21063b files/openvpn-2.0.4-darwin.patch 717
-SHA256 ad70b77c10bb57a07af3d512e953fc8b5a07108df5bf9795e0cb12e1ba2b2136 files/openvpn-2.0.4-darwin.patch 717
 AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d SHA1 09c362da6cea1d6f7e6ff060a4e92493a5b34cba SHA256 b5906cc1bff00ebc3dc9a58861388493aa6d2be774dbacba63c2cfcc8bfa4f92
 MD5 968e83fbca1dca7d68c60aacdb51b6be files/openvpn-2.0.7-pam.patch 1236
 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d files/openvpn-2.0.7-pam.patch 1236
@@ -38,22 +34,22 @@ DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
 DIST openvpn-2.1-udp6.patch.bz2 16625 RMD160 58f7fa1e9eebdfb267782f409b162e84f227faf8 SHA1 cb13e4f7dd973bb782e2bd5cc9a59f5f5bcb3ef0 SHA256 e98bd77e3098a203b23dde34847ba9647f8f0c75d432559d1c3fb1e9ada66322
 DIST openvpn-2.1_rc4.tar.gz 803125 RMD160 d9843c2fb6fda64b5cf9474f42b36068bb4cd845 SHA1 4a22e23e497b7f5269628b1f430207c700cd6ebf SHA256 5d14e101c40e396250727fae7ee9ab734edd4e6e7f55b8209e0e215423775ff3
-EBUILD openvpn-2.0.6.ebuild 4093 RMD160 74a26b728df0cb037d7a183df70b17f608bb7ee0 SHA1 e48a9042fa4c12e80e37bc25d58e957853e30037 SHA256 a701bbca55dca2d8bbc79514dbc0cd04bd8c2c27a9c258fd76c70f2e157eea2b
-MD5 9ec0d85641d0511f4096473e72035437 openvpn-2.0.6.ebuild 4093
-RMD160 74a26b728df0cb037d7a183df70b17f608bb7ee0 openvpn-2.0.6.ebuild 4093
-SHA256 a701bbca55dca2d8bbc79514dbc0cd04bd8c2c27a9c258fd76c70f2e157eea2b openvpn-2.0.6.ebuild 4093
-EBUILD openvpn-2.0.7-r2.ebuild 4212 RMD160 e42624e45c9d00dc8c7168bc342c4075adbd3a7a SHA1 90aa5d3285910e39bdb585848c4759460d26de56 SHA256 9a60a2e1e732636e24beb90eb37f37f001e52992d1ff6cfe42fd7f4c99bf66ca
-MD5 7b434919be41b69a485172c3090a54e0 openvpn-2.0.7-r2.ebuild 4212
-RMD160 e42624e45c9d00dc8c7168bc342c4075adbd3a7a openvpn-2.0.7-r2.ebuild 4212
-SHA256 9a60a2e1e732636e24beb90eb37f37f001e52992d1ff6cfe42fd7f4c99bf66ca openvpn-2.0.7-r2.ebuild 4212
-EBUILD openvpn-2.1_rc4-r2.ebuild 4653 RMD160 2d8334ec8587d8c73d3445f09f84c2dbb9fe9141 SHA1 dea4409ef6aef53cdb1a49f2b8a205339ba1570b SHA256 d680cbf6807d5827f2b965abc3afd7468f1123b9f6d5fdedbc4a1e4a4b93b401
-MD5 c09acba1c95a7881b9c5c7222d9de7ff openvpn-2.1_rc4-r2.ebuild 4653
-RMD160 2d8334ec8587d8c73d3445f09f84c2dbb9fe9141 openvpn-2.1_rc4-r2.ebuild 4653
-SHA256 d680cbf6807d5827f2b965abc3afd7468f1123b9f6d5fdedbc4a1e4a4b93b401 openvpn-2.1_rc4-r2.ebuild 4653
-MISC ChangeLog 18248 RMD160 6062ffa42b356a782d657c8d4649f27dec03e9a2 SHA1 13e6ebd12477a1b7734b8d18be81e2d4b2660af2 SHA256 a14c8cdd0420d553443d87cf9e7f31c3b4643b435a3962e3f21ae4c80564f06d
-MD5 37c98edcf2d198c18a9528cd914449c7 ChangeLog 18248
-RMD160 6062ffa42b356a782d657c8d4649f27dec03e9a2 ChangeLog 18248
-SHA256 a14c8cdd0420d553443d87cf9e7f31c3b4643b435a3962e3f21ae4c80564f06d ChangeLog 18248
+EBUILD openvpn-2.0.6.ebuild 3992 RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 SHA1 e973ea504b42a90d4de99756a0349d6cee80dea3 SHA256 7fac8d4cecd9595317533ee2d2b79e2c93d350b83cffc63c07168c093ed11e28
+MD5 52950cb97246d85e3ea550737b7226cc openvpn-2.0.6.ebuild 3992
+RMD160 a29b45480578f9ff80a8ab202c57813f6052c350 openvpn-2.0.6.ebuild 3992
+SHA256 7fac8d4cecd9595317533ee2d2b79e2c93d350b83cffc63c07168c093ed11e28 openvpn-2.0.6.ebuild 3992
+EBUILD openvpn-2.0.7-r2.ebuild 4157 RMD160 bea9777c7c7a11908258bb265563b2186643d6bb SHA1 d813e2b5a4f0330dee79c8c9f2294d13360541eb SHA256 d7e17d4d9555955052dc00653de5651c21d7494e696fd87bdbf3bc6474aeeca7
+MD5 edc68d6a120e94abbdbcb94497ecd1aa openvpn-2.0.7-r2.ebuild 4157
+RMD160 bea9777c7c7a11908258bb265563b2186643d6bb openvpn-2.0.7-r2.ebuild 4157
+SHA256 d7e17d4d9555955052dc00653de5651c21d7494e696fd87bdbf3bc6474aeeca7 openvpn-2.0.7-r2.ebuild 4157
+EBUILD openvpn-2.1_rc4-r2.ebuild 4593 RMD160 6567672b01b354454f3b28c2b827533d65b316be SHA1 e0ff6726e50fd0bfa91789afa71fc10d202367e5 SHA256 dce1e19c192f8188992a72eefb3b0b5f8aa3d257d8886d40104686a1698d73fb
+MD5 97c8d87f26677ee1f6dbb97e55f557f5 openvpn-2.1_rc4-r2.ebuild 4593
+RMD160 6567672b01b354454f3b28c2b827533d65b316be openvpn-2.1_rc4-r2.ebuild 4593
+SHA256 dce1e19c192f8188992a72eefb3b0b5f8aa3d257d8886d40104686a1698d73fb openvpn-2.1_rc4-r2.ebuild 4593
+MISC ChangeLog 18449 RMD160 6bbaf15f7bbc0c8a9f44630878c9917050b37ad1 SHA1 0253a32cf02f2b6fd219fbd056f2bb20091c444a SHA256 da2a09c8d008890cf14e7a106683404905e1e73832821da8cc63e18ec040ee58
+MD5 2de313356127ef262162b5bea06809e7 ChangeLog 18449
+RMD160 6bbaf15f7bbc0c8a9f44630878c9917050b37ad1 ChangeLog 18449
+SHA256 da2a09c8d008890cf14e7a106683404905e1e73832821da8cc63e18ec040ee58 ChangeLog 18449
 MISC metadata.xml 440 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 SHA1 23d2975ef0f709dc2e754a5867942e679ee60740 SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6
 MD5 62aa0438042b29eba4a6afd971037761 metadata.xml 440
 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 metadata.xml 440
diff --git a/net-misc/openvpn/files/openvpn-2.0.4-darwin.patch b/net-misc/openvpn/files/openvpn-2.0.4-darwin.patch
deleted file mode 100644
index d30b9b9dd42d..000000000000
--- a/net-misc/openvpn/files/openvpn-2.0.4-darwin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- openvpn-2.0.4/plugin/down-root/Makefile.orig	2005-11-02 20:25:40.000000000 +0100
-+++ openvpn-2.0.4/plugin/down-root/Makefile	2005-11-02 20:31:53.000000000 +0100
-@@ -7,11 +7,22 @@
- 
- CC_FLAGS=-O2 -Wall
- 
-+ifeq ($(USERLAND),Darwin)
-+	LIBNAME=dylib
-+else
-+	LIBNAME=so
-+endif
-+
-+lib : down-root.$(LIBNAME)
-+
- down-root.so : down-root.o
- 	gcc ${CC_FLAGS} -fPIC -shared -Wl,-soname,openvpn-down-root.so -o openvpn-down-root.so down-root.o -lc
- 
-+down-root.dylib : down-root.o
-+	gcc ${CC_FLAGS} -dynamiclib -install_name openvpn-down-root.dylib -o openvpn-down-root.dylib down-root.o -lc
-+
- down-root.o : down-root.c
- 	gcc ${CC_FLAGS} -fPIC -c ${INCLUDE} down-root.c
- 
- clean :
--	rm -f *.o *.so
-+	rm -f *.o *.so *.dylib
diff --git a/net-misc/openvpn/openvpn-2.0.6.ebuild b/net-misc/openvpn/openvpn-2.0.6.ebuild
index d300ed5f8d68..6bc9c632b2c5 100644
--- a/net-misc/openvpn/openvpn-2.0.6.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.6.ebuild,v 1.15 2007/04/16 11:43:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.6.ebuild,v 1.16 2007/09/15 07:30:31 uberlord Exp $
 
 inherit eutils multilib
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc-macos ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sh sparc x86"
 IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
 
 RDEPEND=">=dev-libs/lzo-1.07
@@ -33,12 +33,6 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
-}
-
 src_compile() {
 	local myconf=""
 	# We cannot use use_enable with iproute2 as the Makefile stupidly
diff --git a/net-misc/openvpn/openvpn-2.0.7-r2.ebuild b/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
index 5b37ce3ea373..240cbf0c4545 100644
--- a/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r2.ebuild,v 1.3 2007/06/08 06:23:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.7-r2.ebuild,v 1.4 2007/09/15 07:30:31 uberlord Exp $
 
 inherit eutils multilib
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
 
 RDEPEND=">=dev-libs/lzo-1.07
@@ -37,7 +37,6 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
 	epatch "${FILESDIR}/${P}-pam.patch"
 	epatch "${FILESDIR}/${P}-persistent.patch"
 
diff --git a/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild b/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild
index 5e76df3d5504..3836dad3f4c9 100644
--- a/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild,v 1.1 2007/08/16 15:06:56 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc4-r2.ebuild,v 1.2 2007/09/15 07:30:31 uberlord Exp $
 
 inherit autotools eutils multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="examples iproute2 ipv6 minimal pam passwordsave selinux ssl static threads userland_BSD"
 
 DEPEND=">=dev-libs/lzo-1.07
@@ -36,11 +36,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PN}"-2.0.4-darwin.patch
 	epatch "${FILESDIR}/${P}"-ip6-mss.patch
-
 	use ipv6 && epatch "${WORKDIR}/${PN}"-2.1-udp6.patch
-
 	eautoreconf
 }