Always use the JRE provided by Novell

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

4 files changed, 54 insertions, 48 deletions

diff --git a/mail-client/novell-groupwise-client/ChangeLog b/mail-client/novell-groupwise-client/ChangeLog
index 33a2163939ce..1ecd1455883c 100644
--- a/mail-client/novell-groupwise-client/ChangeLog
+++ b/mail-client/novell-groupwise-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/novell-groupwise-client
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/novell-groupwise-client/ChangeLog,v 1.3 2014/09/07 15:20:29 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/novell-groupwise-client/ChangeLog,v 1.4 2015/04/03 21:10:32 dilfridge Exp $
+
+  03 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  novell-groupwise-client-8.0.2.96933.ebuild, metadata.xml:
+  Always use the JRE provided by Novell
 
   07 Sep 2014; Ulrich Müller <ulm@gentoo.org>
   novell-groupwise-client-8.0.2.96933.ebuild:
diff --git a/mail-client/novell-groupwise-client/Manifest b/mail-client/novell-groupwise-client/Manifest
index b258b32ea969..658a287e2c23 100644
--- a/mail-client/novell-groupwise-client/Manifest
+++ b/mail-client/novell-groupwise-client/Manifest
@@ -2,20 +2,25 @@
 Hash: SHA256
 
 DIST gw802_hp3_client_linux_multi.tar.gz 209918505 SHA256 f9be044980dd00703aaf2a1b2b93468e526a308cfe91769a61c7079ec3e08f98 SHA512 3a03ac02954f86c2e797404128441bff980f82cdc9936668fb528aef0190240891f92e4094fe53d58a0684ef8e94ebac7c73fbfa262e72bc450fab8ea9872efd WHIRLPOOL a07c30b18f6902521fe07d60b1ead302dc669a19c3d31e1af5acf91185b581924bd2ccfc07216a00ac06e7451aa981ac88958719d59a51b5a9053a445f455ad5
-EBUILD novell-groupwise-client-8.0.2.96933.ebuild 2698 SHA256 1ab47663508a9845a2a048edcb1159355d7a784e04c033094f8e93503db76937 SHA512 02834705cb9ebf08adca8886bee3f49dda4b7c6408cf6b812394b0d0b59fefe775058d9640925b99ab1aa08adac2176f0402bf33c24bdcc8f87faedc2081c27b WHIRLPOOL b43fc0e86b80d5952894613cf4102510d81a88cbb74eb28aa2f725831309793d030fdb1c4f75e49daeb9c1a57279150b2a6f6985c3026db1650e29e345bbedbd
-MISC ChangeLog 856 SHA256 257219e079ab8a00f637267acb9df5b2a38117f045e84e88958dcc5e76b31747 SHA512 d5d3a342a60bb5712c0f8e7c801c44ae30b5642f4395e94307a2a555bccf18603aa3e0e4b1635f3d993118de058ca3153f44a0441d5f503f3d83b3f66276ab0d WHIRLPOOL f34e4d3cbc64d9051c0b94d2bfa1261cd1a689c3d606f187cbb640359473a7836059c22743af86ddaff7a8cc57bff4776197e02d0e93c28ab213a724ebb93624
-MISC metadata.xml 314 SHA256 e0ad6321f579f7452dbe7f1ea917f4cccf0a79d3ff1b0a51b436589abf579f2b SHA512 01bbfd708f38693e7c7a848550b995fea59b6662ad37c4c059594b770f36da9fff6a481790a2cbc48156aac133b1a78a54f1187a332fc792dc6eb63151bdee09 WHIRLPOOL a160854b6d16eb0340d2e0e39507d752dfc6ab418202ef69f4be697d13cb8ceffccff87fc445dd916e9e5820850e6b81fd8d3c2d1cf1c93acc3fd8c460935e53
+EBUILD novell-groupwise-client-8.0.2.96933.ebuild 2207 SHA256 356657b995d21eb34cd7457ae0f45e145c72aeb4684c9ae2f33b160690bf4386 SHA512 677353e38606e0f19b2499f4eede2ff00f4a2f29fa3e6a6bcecdee3cc8e1daca75bbbb9599a60692df7368941fc7e6e124249e9d9fc25e77c14043add4ca8be8 WHIRLPOOL cb6eba0af5d28bf3e64bb588b3b39b59ef6555679f689aeb44fa00e74777aa5e9dd79b819337f80f43c89171d6e42b5497c3aab1c50bc6de77071ccb56e737fe
+MISC ChangeLog 1020 SHA256 ff489915b2081bb5c5131f4cb63f72f536124e14287f0676bfaf633fc78b9cc9 SHA512 c0afba08c225c15714b761afa626bb87497fce29fd0f665000ab855b205cb0ac38a368a29d861d0a0136744ecc8621dbe7d9db242ccac86219ab2fb701ee692a WHIRLPOOL c46b34b8caf450a8265979cee0355e8b199507eb576abe3164fc4ec85c1721ae6a9f0748c90f59c7c53f7520051043bed69a4c42036b85c5af148dd3b17c3072
+MISC metadata.xml 210 SHA256 6c4d303eb91ec0ba8ca811d7c4a7cee10791b10081661ea6cdef2bbe9ef8df34 SHA512 2c1cf7ada42e312259aa935143e506c080c39fdbb5dcf1e00445d3298952b1cc54115d44a602472ddd90699e1a481789728d13bf3132bd16ef272a59877c1756 WHIRLPOOL e46e984beca73bde3701876c7ac1d6dbdf459d4a2a97cd75ec829c053fd16d972703ddbf29db59d386aa8d8ae73d24d9a4df32fe04c20f5ac75e3e36653fa547
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJUDHfwAAoJEJQzkH1pP7W4EmYL/i4R2r0CgJLTYMZwK1WaTB9o
-O8K2ltwdzOLkO9NT5Hb3rI11NPl7SR6vmcSWoPMzkaYM6tSkTtKtTEClbuOtSs/F
-2aBQSZlwUr0aUMTQG3efqdZvcPY2TOP5rUTVoismIYozCyCuyiiQ3RKH/j68R8XN
-NTZ2N2EH8CgOURLIvaAytqCHRzwSAEBXZoDSWSf2GI1VQW1Sc9UdByd46QuM4Iv+
-tQ1fSyrPpWJIEbaJvuxYzJACn37pL5X0L7VfAX+qFkbE8wtb9Incs+iVKIn40DpR
-+A5RPEk4F2e0GmAImi3McWjlIOel0vrXyMmHHVos2e+0iPoJhxTGNZ9VtXl52aCz
-GjnOxCVhXkFjE5+M7KGYUXNv1Axz0JPTs6Nn2cch2NqJQaF7lYn0Bgcmokede+6s
-3K+JczvLmGlOBp3HfwhJA+Er6iWmOHE8GM8s9tBseub1UVmmDwEx/9sB2WhPSDhD
-jzPrr9DDMT/As7jCouRAhZFnfSMI9gHFeY8TCEgH2A==
-=64j5
+iQJ8BAEBCABmBQJVHwHJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5jXkQAIXOrdUV8P1wRK3Ghvlc4Nc7
+5qtETIiirMxjRrvo/pGYfdtk1JpW8+U07PW/U7oVZwzoNSDlB5B0Z7hDjZXFfXgv
+Ho3kAPr10Hro3DTbEhy8+ff8WrShzq5iRO96ZTOGlHrKLbpEvkL38zxk95g4RiD3
+7MCTSN/8paig9hf40YsHmOHIhwlb288nCXjicrY5cLl4JXMIIMaz649U1myF5J+J
+TvxmAFf7EwF03vk4BsVLFEL8T4Jj8HngaiNOHZtKn+6oZSc0oqzWBJTBtYhpyyzi
+2gyVp64MlVvm78uEehIyvvpsRHsgD4jo/Qn2vZJ//Vz3a7h7gj7yolBVlL8vqj6o
+qufFddqz4QCYxwLBioCVL6TKraSyvg/O0YFJ/Sy917d/ledTG9mWo8VTiXk/u8xa
+7aoBiJNT4x8cLVhUefKOVLX95SNrx7+yOzAajur8ubhI3cTezfVmee3ARzYBJ4HE
+aPOxVasaP8NbUao3J1s3Ev942lOn6OXveLHr9+Len1rjiLp3/PuoOLMoYyz2oIVa
+RGq2XuIeSOdxeK7q6Mu3XsYTI/ei3HBdxSm4Wi6NV8aAcWFtrvbh0MLo2mACR5kh
+hZCC9QPuXm/OwDuCkm9lOf2TFKxZLkjFHYEeHCykymfczpm+mxPB2X6pRRWu6IDd
+dg2B50tVp1w7PMPkp+yi
+=b/lI
 -----END PGP SIGNATURE-----
diff --git a/mail-client/novell-groupwise-client/metadata.xml b/mail-client/novell-groupwise-client/metadata.xml
index 6302c2e5e5d1..606b5ed6bb4d 100644
--- a/mail-client/novell-groupwise-client/metadata.xml
+++ b/mail-client/novell-groupwise-client/metadata.xml
@@ -4,7 +4,4 @@
   <maintainer>
     <email>dilfridge@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="novell-jre">Use the Java Runtime Environment provided by Novell</flag>
-  </use>
 </pkgmetadata>
diff --git a/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
index 1e532747a1e7..4b733e0fdae1 100644
--- a/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
+++ b/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild,v 1.3 2014/09/07 15:20:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/novell-groupwise-client/novell-groupwise-client-8.0.2.96933.ebuild,v 1.4 2015/04/03 21:10:32 dilfridge Exp $
 
-RESTRICT="binchecks fetch mirror strip"
+EAPI=5
 
 inherit eutils rpm multilib versionator
 
@@ -16,19 +16,29 @@ SRC_URI="gw802_hp3_client_linux_multi.tar.gz"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="novell-jre multilib"
+IUSE=""
+
 DEPEND=""
-RDEPEND="sys-libs/libstdc++-v3
-	!novell-jre? (
-		|| ( virtual/jdk
-		virtual/jre )
-		multilib? (
-		amd64? ( app-emulation/emul-linux-x86-java ) ) )"
+RDEPEND="
+	sys-libs/libstdc++-v3
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.8[abi_x86_32(-)]
+	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.3[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.4[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXtst-1.2.2[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.11-r1[abi_x86_32(-)]
+"
+
+RESTRICT="binchecks fetch mirror strip"
 
 src_unpack() {
 	unpack ${A}
-	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
+	mkdir -p "${WORKDIR}"/${PN}-${MY_PV} || die
+	cd ${PN}-${MY_PV} || die
 	rpm_unpack ./../gw${MY_PV}_client_linux_multi/${PN}-${MY_PV}.i586.rpm
 }
 
@@ -37,26 +47,16 @@ src_compile() { :; }
 src_install() {
 	JRE_DIR="${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/java;
 
-	if use novell-jre; then
-		# Undo Sun's funny-business with packed .jar's
-		for i in $JRE_DIR/lib/*.pack; do
-			i_b=`echo $i | sed 's/\.pack$//'`;
-			einfo "Unpacking `basename $i` -> `basename $i_b.jar`";
-			$JRE_DIR/bin/unpack200 $i $i_b.jar || die "Unpack failed";
-		done;
-	else
-		if use multilib; then
-			rm -rf "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/java
-			sed -i 's%/opt/novell/groupwise/client/java/lib/i386%`java-config --select-vm=emul-linux-x86-java --jre-home`/lib/i386/client:`java-config --select-vm=emul-linux-x86-java --jre-home`/lib/i386/server:`java-config --select-vm=emul-linux-x86-java --jre-home`/lib/i386%' "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/bin/groupwise
-		else
-			rm -rf "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/java
-			sed -i 's%/opt/novell/groupwise/client/java/lib/i386%`java-config --jre-home`/jre/lib/i386/client:`java-config --jre-home`/jre/lib/i386/server:`java-config --jre-home`/jre/lib/i386%' "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/bin/groupwise
-		fi
-	fi
+	# Undo Sun's funny-business with packed .jar's
+	for i in $JRE_DIR/lib/*.pack; do
+		i_b=`echo $i | sed 's/\.pack$//'`;
+		einfo "Unpacking `basename $i` -> `basename $i_b.jar`";
+		$JRE_DIR/bin/unpack200 $i $i_b.jar || die "Unpack failed";
+	done;
 
 	domenu "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/groupwise/client/gwclient.desktop
 
-	mv "${WORKDIR}"/${PN}-${MY_PV}/opt "${D}"/ || die "mv opt"
+	mv "${WORKDIR}"/${PN}-${MY_PV}/opt "${D}"/ || die "mv opt failed"
 
 	dodir /opt/bin
 	dosym /opt/novell/groupwise/client/bin/groupwise /opt/bin/groupwise