Fix for prefix.

Package-Manager: portage-2.2.0_alpha47_p6/cvs/Linux i686

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 30f25c6783f5dafc18da0ddcca2471ad793e7c26..409e72a6fa32108ac0447581bfd99c76d41f5c06 100644 (file)
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.216 2011/05/01 10:40:19 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.217 2011/07/28 13:25:53 zmedico Exp $
+
+  28 Jul 2011; Zac Medico <zmedico@gentoo.org> openvpn-2.2.0-r1.ebuild:
+  Fix for prefix.
 
 *openvpn-2.2.0-r1 (01 May 2011)
 

diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 6e75af75383abe62cc81ac481b43d28796c2a7bc..2e88700d73b0c0d2967760b00362a8d8e83ad09d 100644 (file)
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -15,14 +15,14 @@ DIST openvpn-2.1.4.tar.gz 863726 RMD160 3d4be2fe625883598370d74e8f7d9274eb40a636
 DIST openvpn-2.2.0.tar.gz 898381 RMD160 32aa52c886d98b6b92150dfc64d3a9c07f6e8b30 SHA1 97e3389814a1bcef5a6d22774534a30e41d48bff SHA256 71ebeaaba1641e6d1454ae0f10f986002e5c6afdcd09da659122e3e5c74a2567
 DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 RMD160 a553399ffe3b6cf0c116b92399df7d801972e3ca SHA1 d7ce041c4e7f0186091e17a2d178bd12e7a4696d SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21
 EBUILD openvpn-2.1.4.ebuild 5756 RMD160 bb072d99f691c83deb13bf28ebc0b8371289f684 SHA1 d96e70b08ef9ca858bf5f21946db44fd33cf9163 SHA256 0b5de7ae685a6cc5416ec6ba2adecfc51052e19f1d8114c2b4d1fedf2a06653a
-EBUILD openvpn-2.2.0-r1.ebuild 5271 RMD160 55e96c8580846cb73499507cbd45aba892023a14 SHA1 ae6d7cb8a907420f7c142c5aa85e30300eae2d93 SHA256 b58a3ccc4caa88a3ecd57ff51281945e6f0948cbc5288beed299b369c27748d4
+EBUILD openvpn-2.2.0-r1.ebuild 5295 RMD160 d652ba815bdb536ff4b269c5c55bb320857c9f68 SHA1 52dfe6bfb7c28884e941ea325e9822b1c3bad8e9 SHA256 e8bc27cd4aa61395401a41531c243aa68db3e982802af4ddc61b24c17b7fe3ae
 EBUILD openvpn-2.2.0.ebuild 5499 RMD160 868ffa4c4ea13eaf7e55ad62b7574e8350f92863 SHA1 8d7eb2ed7b7a0df8cdfa02baf4212275a6805f0f SHA256 78d4ded9754e7948a1886f95df8f8c9407c9bc788cff7c15bd550b62e7bf3ad3
-MISC ChangeLog 31672 RMD160 54b9a45840a039a384b458d8074582c151189aec SHA1 a212de393975b73df22bc08d98df8fc049f083da SHA256 e1896b43164d6c62519af76d06eca4450a1a44aef7f2ae3e2fbddd8fd7c0f0f6
+MISC ChangeLog 31767 RMD160 3fd36430cd3b02fde1251c1b77e57684d3b2bdce SHA1 cbcbd254bb363aa8dd573d82933649a744ecc227 SHA256 0ca8d4cb8a64d0c7fe46ae23d80df321ab955df94046113f1c65ae4e5631ff14
 MISC metadata.xml 831 RMD160 676787d48f1794d3769c159505c4f50673715fd0 SHA1 df225c398a434e6103716cc15539b6ed2e2cfa3c SHA256 1210ff6c2e7ef7c19c5c33df245be9845678bc8017a5e0477835ded1acbfa385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk29OKgACgkQxeMuLWsGW/vdbQCdG4OKRJ8AU3pgMlKzCksDkIDv
-RH4AnRXM2nsh0U+xhhw6LP+HCYRAbGcZ
-=PjW1
+iEYEARECAAYFAk4xY2cACgkQ/ejvha5XGaPqUgCffLrb1Xcko8RSQPfH0zwKYFWC
+IV4AnRVnebdrL3aS8EObsv2Upc4WjqLN
+=vs0f
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
index b022203b78e864e3383d202baa2ecab55da8d01e..b4aa6c0ed7042e36b02640fd5cb24bc4edaebe2c 100644 (file)
--- a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.0-r1.ebuild,v 1.1 2011/05/01 10:40:19 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.0-r1.ebuild,v 1.2 2011/07/28 13:25:53 zmedico Exp $
 
 EAPI=4
 
@@ -63,7 +63,7 @@ src_configure() {
                $(use_enable ssl) \
                $(use_enable ssl crypto) \
                $(use_enable iproute2) \
-               --docdir="${DESTDIR}/usr/share/doc/${PF}"
+               --docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
 src_compile() {
@@ -113,7 +113,7 @@ src_install() {
        doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
        if ! use minimal ; then
                cd easy-rsa/2.0
-               make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
+               make install "DESTDIR=${D}" "PREFIX=${EPREFIX}/usr/share/${PN}/easy-rsa"
                cd ../..
 
                exeinto "/usr/$(get_libdir)/${PN}"