Update installdir with USE=build, die when users set the flag.

(Portage version: 2.2.0_alpha85/svn/Linux x86_64, unsigned Manifest commit)

svn path=/java-overlay/; revision=8971

6 files changed, 23 insertions, 14 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 8ae910e5..417d3d0d 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-java/icedtea-web
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Feb 2012; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.3.ebuild,
+  icedtea-web-1.1.3-r7.ebuild, icedtea-web-1.1.4.ebuild,
+  icedtea-web-1.1.4-r7.ebuild:
+  Update installdir with USE=build, die when users set the flag.
+
 *icedtea-web-1.1.4-r7 (24 Nov 2011)
 *icedtea-web-1.1.4 (24 Nov 2011)
 
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 4d0de49d..88d0d974 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -2,9 +2,9 @@ AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160
 AUX 0002-Respect-LDFLAGS.patch 352 RMD160 350d3e85929372dc4193834e6994787aceed7003 SHA1 66a60a87bf6b5487a55e036bef9df42918988b9d SHA256 3e4660e84420e2ae85b00eef40e7e20c0df2c6965fda6827ab025e8167e8f866
 DIST icedtea-web-1.1.3.tar.gz 810141 RMD160 7f3c7063e538d15730337e1991fe9f1038cf83fe SHA1 5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37 SHA256 012390dfa8bb9a4b17b30640dfc21011c848f5017d2a21d945e933f5d514edb3
 DIST icedtea-web-1.1.4.tar.gz 812273 RMD160 2aac06c05d4513694968f86861225b5329307781 SHA1 9389030878d7c3aee17f641e3095830fe722fb60 SHA256 b17a742af0153b7887cf667a160f8519afad125bc515b0f4783c66e7ee1a7f26
-EBUILD icedtea-web-1.1.3-r7.ebuild 4186 RMD160 05d67bede81d8df277ced43d24a10f1cb1d80a77 SHA1 fc0199d77c6556fc004487e51dc876b7047bbe00 SHA256 bc17ab3476f9855ec64dfcd8151b165ba5bbbb967fc6de891f58a4f3d5ef6b84
-EBUILD icedtea-web-1.1.3.ebuild 4198 RMD160 73959cfae00182f961c2f89a0f2301f4c886ff82 SHA1 3c163f9d96c36453cbbbe7a99425dc5de9265ff1 SHA256 ea7f81251fc65490e5b32c12ba5080160626a13d0614fa0cb11598c3ce10cd68
-EBUILD icedtea-web-1.1.4-r7.ebuild 3856 RMD160 05aeafd2750b529432308dcac3890a3473b2e4b3 SHA1 b74a3448d8df7baec643dca8e17712c0b1416edc SHA256 a2313638ec4278f8f2ac5a02f11bc286b1d73d7817bf823ead88b2d7e60a94c0
-EBUILD icedtea-web-1.1.4.ebuild 3865 RMD160 629c9d82a0c8b24bae9ac67f6e603852b663d998 SHA1 0f807ddeff4a656ea8c05df4224c6ee277ed33cf SHA256 e7f41fb85fd94f40a45cffb40424ee641d34608c1824440bc2d06cb9b8d73264
-MISC ChangeLog 4952 RMD160 8b6d676389b96b28ada317326cca9bb36140ebaa SHA1 39be5e81164f5bf71ef921f75db216faea64bbf4 SHA256 3c95504220146e1b8f02f6171603c0fb0a7f796d5f9cdfd7eb90e8eb503aeb36
+EBUILD icedtea-web-1.1.3-r7.ebuild 4277 RMD160 9d55f9a1f5fd762b7225168d445c9eaa7be25eb1 SHA1 8274ad585b36cf093ac3c03832d8598e993bc8e2 SHA256 4e67a6bc0b3b0e5e6357114ffc986f6022ad0307e3760683341626d44e83aae2
+EBUILD icedtea-web-1.1.3.ebuild 4289 RMD160 9ddbdfba8a90b62fe4bf9710b46c4e57baa6709c SHA1 2f3009af4bfe6fb99cf1370f7685037c6a821450 SHA256 d0fbc2a7df6b23c088721396a039187df2ab360faf4890b80558c0deab997f1d
+EBUILD icedtea-web-1.1.4-r7.ebuild 3947 RMD160 c2ca94f363127be835030b371e23eabdf0cdfbc5 SHA1 06d72d0ac062153b4e10e224becb85af5acf123f SHA256 658a99feffd54753b9ea3718e2870aa33cb9097578775448729b8e24c0c45ec5
+EBUILD icedtea-web-1.1.4.ebuild 3956 RMD160 97b5d4c531d8bd0856407a305119b28a14ef5e27 SHA1 3fd09263950f4d062bdc4b3b207545cb6c14dd05 SHA256 324335acb6270fa0e32ab905f885b828fe1e1c0964182725179f3f2df90a2cc6
+MISC ChangeLog 5183 RMD160 4f4a760c15f3b59f7f7f5c8e065ea5822c40629a SHA1 26637256db8410644bb94a646bce41439075e8da SHA256 945e0ee3c828a336d93ce158d09636b29a0ae080ea34a45a0ee142c58a9e2a20
 MISC metadata.xml 532 RMD160 475b5d799d063ecc980d17896d8b591680ac2a7d SHA1 acf45999323b8df83b432973a11d64e2577ff022 SHA256 48eafb34adc623b7f298610feaac56f61a01f52658b83be30e4cc8d3a9b9f1d7
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild
index ff944371..5b2bcba7 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3-r7.ebuild,v 1.1 2011/11/04 11:19:09 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
@@ -78,7 +78,8 @@ src_configure() {
 
 	if use build; then
 		icedteadir="${ICEDTEA_BIN_DIR}"
-		installdir="/opt/icedtea${SLOT}-web-bin"
+		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
+		installdir="/opt/icedtea-web-bin-${SLOT}"
 	else
 		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
 		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
index 29d36f25..ad283401 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.2-r1.ebuild,v 1.1 2011/09/18 21:53:18 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
@@ -78,7 +78,8 @@ src_configure() {
 
 	if use build; then
 		icedteadir="${ICEDTEA_BIN_DIR}"
-		installdir="/opt/icedtea${SLOT}-web-bin"
+		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
+		installdir="/opt/icedtea-web-bin-${SLOT}"
 	else
 		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
 		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
index b8a05bc1..6a50f0c1 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r7.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
@@ -67,7 +67,8 @@ src_configure() {
 
 	if use build; then
 		icedteadir="${ICEDTEA_BIN_DIR}"
-		installdir="/opt/icedtea${SLOT}-web-bin"
+		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
+		installdir="/opt/icedtea-web-bin-${SLOT}"
 	else
 		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
 		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
index 8ffd50d1..b2666c3e 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4.ebuild,v 1.1 2011/11/24 20:57:04 sera Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
@@ -67,7 +67,8 @@ src_configure() {
 
 	if use build; then
 		icedteadir="${ICEDTEA_BIN_DIR}"
-		installdir="/opt/icedtea${SLOT}-web-bin"
+		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
+		installdir="/opt/icedtea-web-bin-${SLOT}"
 	else
 		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
 		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"