Fixed compilation problem on Darwin and marked ppc-macos (bug #111116)

(Portage version: 2.0.51.22-r3)

5 files changed, 49 insertions, 15 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index d950855b6371..7fefd06fdc1e 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.52 2005/11/02 18:18:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.53 2005/11/02 20:13:59 grobian Exp $
+
+  02 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/openvpn-2.0.4-darwin.patch, openvpn-2.0.4-r1.ebuild,
+  openvpn-2.0.4-r2.ebuild:
+  Fixed compilation problem on Darwin and marked ppc-macos (bug #111116)
 
 *openvpn-2.0.4-r2 (02 Nov 2005)
 *openvpn-2.0.4-r1 (02 Nov 2005)
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 15508ea43b16..d95d98acf22f 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,18 +1,19 @@
-MD5 6a972e625296a23ca0739f3eaecebde8 openvpn-2.0.4-r1.ebuild 3147
-MD5 7755f62728b9f97a4c14e2df448a747a openvpn-2.0.4-r2.ebuild 3811
-MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
-MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
-MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
-MD5 d86cd4abebe0685b45a927eebb7d3064 ChangeLog 8463
-MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
 MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
 MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
+MD5 ca84144b05897d9f2f70df4484c584f9 openvpn-2.0.4-r2.ebuild 3851
+MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
+MD5 79e0e62badbadc29b744368d2ee21140 openvpn-2.0.4-r1.ebuild 3186
+MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
+MD5 d86cd4abebe0685b45a927eebb7d3064 ChangeLog 8463
+MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
+MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
-MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
-MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
 MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
+MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
+MD5 9f0fcb64287dc55bb770ca86415e5cdd files/openvpn-2.0.4-darwin.patch 717
 MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
+MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r1 65
 MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r2 65
+MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
 MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
-MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4-r1 65
-MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
+MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
diff --git a/net-misc/openvpn/files/openvpn-2.0.4-darwin.patch b/net-misc/openvpn/files/openvpn-2.0.4-darwin.patch
new file mode 100644
index 000000000000..d30b9b9dd42d
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.0.4-darwin.patch
@@ -0,0 +1,26 @@
+--- 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.4-r1.ebuild b/net-misc/openvpn/openvpn-2.0.4-r1.ebuild
index 7a4bd0888cc7..8318ff8a32d1 100644
--- a/net-misc/openvpn/openvpn-2.0.4-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.4-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/net-misc/openvpn/openvpn-2.0.4-r1.ebuild,v 1.1 2005/11/02 18:18:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.4-r1.ebuild,v 1.2 2005/11/02 20:13:59 grobian Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc-macos ~sparc x86"
+KEYWORDS="~alpha ~amd64 ppc ppc-macos ~sparc x86"
 IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
 
 RDEPEND=">=dev-libs/lzo-1.07
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack "${A}"
 	gnuconfig_update
+	epatch "${FILESDIR}/${P}"-darwin.patch
 }
 
 src_compile() {
diff --git a/net-misc/openvpn/openvpn-2.0.4-r2.ebuild b/net-misc/openvpn/openvpn-2.0.4-r2.ebuild
index 2f369c46bcf6..edf88e46363d 100644
--- a/net-misc/openvpn/openvpn-2.0.4-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.4-r2.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/net-misc/openvpn/openvpn-2.0.4-r2.ebuild,v 1.1 2005/11/02 18:18:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.4-r2.ebuild,v 1.2 2005/11/02 20:13:59 grobian Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack "${A}"
 	gnuconfig_update
+	epatch "${FILESDIR}/${P}"-darwin.patch
 }
 
 src_compile() {