net-misc/openvpn-gui: fix LANG setting to respect ISO 639-1 (patch sended to Heiko Hund), use more bashism, fix dependencies, windows need static openssl libs, update git URI, correctly define WINDRES, and so remove the usage of src_compile, refresh installes docs. New stable release as there is now.

Package-Manager: portage-2.1.12.4

4 files changed, 121 insertions, 34 deletions

diff --git a/net-misc/openvpn-gui/ChangeLog b/net-misc/openvpn-gui/ChangeLog
index 80903f6d..34bce772 100644
--- a/net-misc/openvpn-gui/ChangeLog
+++ b/net-misc/openvpn-gui/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openvpn-gui-4 (14 Jun 2013)
+
+  14 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> +openvpn-gui-4.ebuild,
+  openvpn-gui-9999.ebuild:
+  net-misc/openvpn-gui: fix LANG setting to respect ISO 639-1 (patch sended to
+  Heiko Hund), use more bashism, fix dependencies, windows need static openssl
+  libs, update git URI, correctly define WINDRES, and so remove the usage of
+  src_compile, refresh installes docs. New stable release as there is now.
+
   10 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> metadata.xml:
   Fix manifest
 
diff --git a/net-misc/openvpn-gui/Manifest b/net-misc/openvpn-gui/Manifest
index f8bc58f3..0d5c6444 100644
--- a/net-misc/openvpn-gui/Manifest
+++ b/net-misc/openvpn-gui/Manifest
@@ -1,5 +1,7 @@
 AUX openvpn-gui-BJA-StringFileInfo.diff 2404 SHA256 8e0f10313b207d4d27a58ee55458a1cfd8177d70974dc3b3225a221bc44ee272 WHIRLPOOL 673c74693d24a139fe27366788a87f5b908362a8cec7d6b8a8a0e844d04d3857374a50909120c5fcc572127aa393354175b8a184bca0b4f6b150c5a4eae7ad2d
 AUX openvpn-gui-BJA-empty-passphrase.diff 846 SHA256 2a99407a0d0d394a218a41a984f486c6412e63848f3784d7039790e0b9f3f299 WHIRLPOOL 95408bee34b5eef954339f3c9376e0744708dcd80356587eba25dd74cd5ea498e833ffc382b0b72253e83ae35379c5927886043e46c4c0f598f486c703c618a1
-EBUILD openvpn-gui-9999.ebuild 1554 SHA256 93eb0e27305821fc5fe852d2b6b48c69623b756a928c161b92f406c973a570d7 WHIRLPOOL 4439b4a379f6f15b4062c6af10055b4ac2acbcddb3b999cefdae6788b16cb5c4417250194a36eca0f20ed874492b54f1352b423a37ef685dbcdee3bb02b26f62
-MISC ChangeLog 1129 SHA256 67f0ee5fb71563f2aeb1b643ca0e94bf140a93e6c6793b7ce8da1bb1a00a2d0e WHIRLPOOL 6b44ea488dc7c20a340b3dcd8be8ae19404cf411786411447bd2de5d7ebe41ae0d8f4c3d3d4c59c0277041aa57290ddcd2d0e6a9e74bf7bbe2a44eb469723ec3
+DIST openvpn-gui-4.tar.gz 216393 SHA256 e3a00e245b41254fbb92256d35dafb315a5fff11610afa23954c5d0846bb0e9b WHIRLPOOL a5a8999c2d7def8daf9d811647d16c1246b20ab859429a82e1095c5e9a3c30cbf3a216b40fc8d93f6ce6726ddecc6d1bb260ca8931866cd87c0c1f07ab0c25f2
+EBUILD openvpn-gui-4.ebuild 1532 SHA256 bd60ab97033b20e7c2c1a580f8f130841f9819c7f9673bd06e06d25df66adda7 WHIRLPOOL 655bc79e9fd930525fd9368c94fe87e0e8cb72092c68bad2d39a4207ff5becfff4229d778acf71add227ab2d20327615988a2014091d2a3f42c00a8d7f3b61bc
+EBUILD openvpn-gui-9999.ebuild 1543 SHA256 35908eb24a9c34e0000d94de0d0874037d1c2d91c8b7c8d2fff33dc4f1556467 WHIRLPOOL 806d6d3d183c527216863c93e3c0d84b1767717cbef6bef44e1a155c7c5bebeeed628dd6314255a0cad29fec27b67a513739fd01934fe2c1e29ead046beceb55
+MISC ChangeLog 1573 SHA256 2253c718580ae6adea5221c1e750665f53a45b4299d68456f723af4aa0828912 WHIRLPOOL e7639b8a9f5d5e70ab3755941caa4e2ee6c9f99139b0a2d9936a31fc00363edbd1ac72bc8c303c996808b2b43d0c8520d240aecfad6ca56a2f10d29ab2ad83d5
 MISC metadata.xml 364 SHA256 028f90eb7ffdff0ab6ccbcf8639e2a939924944fea29ca856641236fe1dfdd00 WHIRLPOOL e2a41e7215c9e73557794666e9fafee754790f25bc9eebf13e5018246371c9ae9e4c375bb259972a469e0cd004587234e80f9fcfa97d35631d3aeff44837a7ec
diff --git a/net-misc/openvpn-gui/openvpn-gui-4.ebuild b/net-misc/openvpn-gui/openvpn-gui-4.ebuild
new file mode 100644
index 00000000..24312453
--- /dev/null
+++ b/net-misc/openvpn-gui/openvpn-gui-4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="OpenVPN GUI is a graphical frontend for OpenVPN running on Windows 2000/XP/Vista/7"
+HOMEPAGE="https://sourceforge.net/projects/openvpn-gui"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="empty-password"
+
+ILANG=(
+	da DANISH
+	de GERMAN
+	en ENGLISH
+	es SPANISH
+	fi FINNISH
+	fr FRENCH
+	it ITALIAN
+	ja JAPANESE
+	nl DUTCH
+	no NORWEGIAN
+	pl POLISH
+	pt PORTUGUESE
+	ru RUSSIAN
+	se SWEDISH
+	tr TURKISH
+	zh CHINESE
+)
+
+for l in "${ILANG[@]}" ; do
+	[[ -z "${l//[A-Z]/}" ]] && continue
+	IUSE="${IUSE} linguas_${l}"
+done
+
+SSL_DEPEND=">=dev-libs/openssl-0.9.6[static-libs]"
+
+DEPEND="virtual/pkgconfig
+	${SSL_DEPEND}"
+RDEPEND="net-misc/openvpn
+	${SSL_DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-BJA-empty-passphrase.diff"
+	use empty-password && append-flags "-DALLOW_EMPTY_PASSWORD"
+
+	strip-linguas ${ILANG[@]}
+	[[ -z "${LINGUAS}" ]] && LINGUAS="en"
+
+	set -- ${ILANG[@]}
+	while [[ $# -ge 2 ]] ; do
+		l="$1" ; wl="$2"
+		shift 2
+
+		if ! has ${l} ${LINGUAS} ; then
+			sed -i \
+				-e "/^#include/ {/${PN}-res-${l}.rc/d}" \
+				-e "/LANG_${wl}/d" \
+				"${S}/res/openvpn-gui-res.rc"
+		fi
+	done
+
+	tc-export CC
+	tc-getPROG WINDRES windres > /dev/null
+
+	eautoreconf || die "eautoreconf fail"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto "/usr/share/${PN}/images"
+	doins res/*.ico
+
+	dodoc README
+}
diff --git a/net-misc/openvpn-gui/openvpn-gui-9999.ebuild b/net-misc/openvpn-gui/openvpn-gui-9999.ebuild
index 38a41cf8..21164fa7 100644
--- a/net-misc/openvpn-gui/openvpn-gui-9999.ebuild
+++ b/net-misc/openvpn-gui/openvpn-gui-9999.ebuild
@@ -7,11 +7,16 @@ inherit eutils flag-o-matic git-2 autotools
 
 DESCRIPTION="OpenVPN GUI is a graphical frontend for OpenVPN running on Windows 2000/XP/Vista/7"
 HOMEPAGE="https://sourceforge.net/projects/openvpn-gui"
+EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
 IUSE="empty-password"
 
 ILANG=(
-	de GERMAN
 	da DANISH
+	de GERMAN
 	en ENGLISH
 	es SPANISH
 	fi FINNISH
@@ -22,32 +27,34 @@ ILANG=(
 	no NORWEGIAN
 	pl POLISH
 	pt PORTUGUESE
+	ru RUSSIAN
 	se SWEDISH
 	tr TURKISH
+	zh CHINESE
 )
 
-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
-
 for l in "${ILANG[@]}" ; do
-	[ -z "${l//[A-Z]/}" ] && continue
+	[[ -z "${l//[A-Z]/}" ]] && continue
 	IUSE="${IUSE} linguas_${l}"
 done
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
+SSL_DEPEND=">=dev-libs/openssl-0.9.6[static-libs]"
 
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}
-	net-misc/openvpn"
+DEPEND="virtual/pkgconfig
+	${SSL_DEPEND}"
+RDEPEND="net-misc/openvpn
+	${SSL_DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-BJA-empty-passphrase.diff"
+	use empty-password && append-flags "-DALLOW_EMPTY_PASSWORD"
 
-src_prepare () {
 	strip-linguas ${ILANG[@]}
-	[ -z "${LINGUAS}" ] && LINGUAS="en"
+	[[ -z "${LINGUAS}" ]] && LINGUAS="en"
 
 	set -- ${ILANG[@]}
-	while [ $# -ge 2 ] ; do
-		l=$1 ; wl=$2
+	while [[ $# -ge 2 ]] ; do
+		l="$1" ; wl="$2"
 		shift 2
 
 		if ! has ${l} ${LINGUAS} ; then
@@ -58,29 +65,17 @@ src_prepare () {
 		fi
 	done
 
-	epatch "${FILESDIR}/${PN}-BJA-empty-passphrase.diff"
-	use empty-password && append-flags "-DALLOW_EMPTY_PASSWORD"
-
 	tc-export CC
+	tc-getPROG WINDRES windres > /dev/null
 
 	eautoreconf || die "eautoreconf fail"
 }
 
-src_compile () {
-	emake \
-		OPENSSL="${ROOT}/usr" \
-		RES_LANG="${X}" \
-		WINDRES="$(tc-getRC)" \
-		|| die "emake failed"
-}
-
-src_install ()
-{
-	dobin "${PN}.exe"
+src_install() {
+	emake DESTDIR="${ED}" install
 
-	dodoc changes.txt
-	dodoc "OpenVPN GUI ReadMe.txt"
-
-	insinto "usr/share/${PN}/images"
+	insinto "/usr/share/${PN}/images"
 	doins res/*.ico
+
+	dodoc changes.txt README
 }