Always require java for live git ebuilds now #488118 by hal.

3 files changed, 17 insertions, 19 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index cc49b6f4838d..594cab7b8f22 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.197 2013/11/10 17:21:41 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.198 2013/12/31 00:30:11 vapier Exp $
+
+  30 Dec 2013; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Always require java for live git ebuilds now #488118 by hal.
 
   10 Nov 2013; Fabian Groffen <grobian@gentoo.org>
   +files/xbmc-12.1-nomythtv.patch, files/xbmc-9999-nomythtv.patch,
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 4e552c0b15ec..533925c4c323 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX generate.sh 528 SHA256 5b2dd3d5342b9c9568b9cfa75e670a9fe7ed7ec82e500cca9927dc80e8280702 SHA512 6dc864c57c32739131bfb52aa37dbbfaf1c7208006999f9cd158edf1cc33d57f2a3a3695c20a6b30d9d8f1042fec1d14063f2afe593f5cdf7e0207ff0077451d WHIRLPOOL 971cb3777e19175d4413f0edf1888641fda86cd01611ad8f95a6dffb1ce60865f4025f4a00e1296210035e2ab679f592605f60c223603730ce258ea1f26aa35c
+AUX generate.sh 559 SHA256 787bb8867b0b538041f4e3fb766a9c2580a0804401c8ae20172c5dfe298663a4 SHA512 94a1843f773923ec01248514f21ca795db6bad5317b1a742c10d826d8171ad9496461ac4cf87b21af1fafb9227a06570b1d1c1083bc5ef832b971c4e8bf1d854 WHIRLPOOL 7c60b4de5f148d73840745832e5aa694dba93f23965eec581e6f40707b94648caf2114ca7f9a50b509a92456fc631a5fd6b570bd58a3c3cb051147dc389093d8
 AUX xbmc-11.0-ffmpeg-0.10.2.patch 1197 SHA256 84e2a842c81c1bc6a346c946301f38e47862051f4e3f56ffe468852542ba9b90 SHA512 c7bf34086e27c8789177665a862464018082404f3947a2b9f799a34cae15a01760bc67a148de6da20036c9e17ca047fbd32ed4237980af16605ee2d306c9f9a4 WHIRLPOOL 67cfa7538f59fc1a3cb664218de64b8518a66a97fdc4cd42f43f4882240f665f5be4e448df01df623b538899320f86b7f2d94989fbdb8667289fc8ebdb7f67c7
 AUX xbmc-11.0-ffmpeg.patch 1566 SHA256 5515321c4cb46b0ac1c959b9e8752c370344352d9f7de1be3991760fa6ffc70f SHA512 c7ccba50e6f8fa8dd714ddf0cf1348c7311aefa9d9e971b0287757f75b51d8640d7e404940e12f7b53dbca3ce0bdc81c5b2913d6a73e2edd1ca7351b0a986fdb WHIRLPOOL 088d39196324112d2b133df19489427ca6e84fe7eaf410d9be5603601562019dd78427c4ff438814928c1e3db4c22d742824b6458ef15b79a46ea2c8b79f749d
 AUX xbmc-11.0-libav.patch 3636 SHA256 b30f3c16595f9d79fe4f091504ae9d1f7b01042c988394e89ec467583d1e371d SHA512 cb71c6601df413136eb80c61345d6123ed4c7c5b3c99346f32986cf177afe966ab56cee13b4aa8a91ed37150c73c6f2c891e7f7ba7c34935483e47b7fda525d4 WHIRLPOOL 3487e0d19c1fffba396b406e95f1a9ab85d2ae33c6ca3f88ab3e35ac170e670d0611529ede7a6568f96df73f2dd4b311f3ef5acfde75384166d2b9da0b17473a
@@ -16,18 +13,13 @@ DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8
 DIST xbmc-12-libav.tar.xz 6080 SHA256 84ba05dc66a476d2cb940c10355a22a04c5ef3b4fd6bd96a87a1fb2ffa7ccc0c SHA512 cde76dd435fb449ec843aaaa41a46f0fb4efeeb753669f9e4d052c06f00fe512be9fe994d5dd56794f47ce2f49146a2782f2da72dd78a1f66e5f54ca15723f13 WHIRLPOOL 07ba9e3fb3a4ba6d2c52055bcbe52009a87363bc8e0b21ebc90965bd3562196eee728103028fe8baaad250def5c6f76616a19731f825955648df9ff01c905e6b
 DIST xbmc-12.1.tar.gz 67430677 SHA256 29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3 SHA512 a8b5194766e32e09fa65c0e3656ff180c15761ce2348dc8a1fff0c65247b47e644db4fc91a829e73907b6a52c8e1bdebf624640b9dd06cea2c46bda1d2b3b4a5 WHIRLPOOL 13dbaf040faaaef1b04da892949e9684d7a958cec286b3a5f8cb449ec0fea6b5f96c2a473ece840b86103eb03dd1f39dd66411e5b0526785256d2cc92e1e95e8
 DIST xbmc-12.2.tar.gz 67663000 SHA256 b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6c7ca27a7dc749df0bcea1c SHA512 d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39 WHIRLPOOL c3fc97e5f45a38a259bca06af0b171630ac16832034410e45174d900358b1d16b72940b29475dcad72a2198d8722859a229152379ab7784a7d61f961eb261ddb
-DIST xbmc-9999-20130413-generated-addons.tar.xz 53088 SHA256 20f752b240f2fd9f0f5b061d576c9d215d494bdaeee0d6118a413b2cf62567bc SHA512 203d1e143f83c03f5700710167b050d09d0d7996b8499d47f886009a801bab9eb2ae67ab612b551a9d2e541fc622e08a21f91df4206b3dd456f2b2bc12d514c3 WHIRLPOOL 92470a764ddd55cc2ea242b7b7df2a15c40fd6b273c30510624ef11a7b7870418956b3ad0df0853334053e50c4b141e00969f8458a9bd13aaf9dfeb3f79902a6
+DIST xbmc-12.3-generated-addons.tar.xz 52228 SHA256 477f789dea36969149fe118ecac1c4f3d8c3414772cc6c569be4aefb7e3f221e SHA512 2107271445c0cdcc14b348d011e12ffaaee75bbec506496798f64218256ab9e86cc0ada5edc1e70e509ac1ab366695fae4c15e90bd47fa57ccfe723d7e406b85 WHIRLPOOL 3963577539dee04f33dc4b988944f906688d77864d5e6a6b403e4578c9a91f2b77c256e6b4ed234a9722524c1c3acc626a28ff44c6376c09d93f24008abf54cd
+DIST xbmc-12.3.tar.gz 64615159 SHA256 3e15c960d034efdea5f92a7b74716cb48094842d077b076025fd8640754ede73 SHA512 abe5333f940460a2d40b04a4821f932b44c7605e0d4954e48781317aa25ee04e102b051165842094c5804024c637ca30506773dc3319aba7ab6dbfbe1973ccaa WHIRLPOOL 035cf5792c3c9785eb0a5227406c66298591bafc1251889d4e4a2742ffd715c374c0b6e092f5705db181412de9cae6d1eb3e9c370f3390858b4651f4c135fda1
 DIST xbmc_backports-12-1.tar.bz2 5010 SHA256 a222c32f5a4a0a8690b1544674cfbfeddf81943e85b6ea716768b83c9eba5fa8 SHA512 19b29808f7a3a7b0642f8463bdd229041588d2f42952fe55a17ab69b5b259cde249eb763598893463218d0ab6c747bf3c81e045bdbf5655f9f5f2d2067cb35d2 WHIRLPOOL cc6870dabca8b53a1a6055a4218a8f9bbb2c031ab3b928040325fb121ea75ae6db431542660d28c3bc6900a904e2c0949d69651b2f63faffe8bc7f670d519f06
 EBUILD xbmc-11.0.ebuild 6299 SHA256 9766e13599ba897a01e1ac279db544fa69c32f79fac20fddbaa42bb0e76f2199 SHA512 2a46985734e6284be47049482e0bc16a49fdaacd20d1fc822870f7b6a22ceaee4a9b176e242be948fd24b155db8854240660fb340a7b724f593345adee5c06d5 WHIRLPOOL 3483f3db0e1803407454dc04513e3be8a30d337a0a68555601b5d63ff7dfbaacaec829ab84156536cc4047eb7f4fc8630e6e24ab3594bbbc5a560feda27c0d43
 EBUILD xbmc-12.1-r1.ebuild 7115 SHA256 47046f45870a9e0e21ee35438ff49c93305235769a1d7ccb689a50ef7d64a11b SHA512 ad7bf1e5febb5fb3a0576622d4b29b37ff0a42843eafc3afe1bf6d04452bdffcb039bdfdb60ab5edcc2f26d15f4de626664268bb8aa8cd78c692c5d860e4022e WHIRLPOOL e9cf6c3758b9568634ad3ddff4ff55b662be6e77e0c3b292be422f252053786fa23147efdbaee37aae8296f40324dedabce4f02522a037524d51b453d2986414
 EBUILD xbmc-12.2-r1.ebuild 7076 SHA256 6118ad038ea8c0232a7c1d6309cafdab8fd61137c56a7a845c03b5df3d64c48c SHA512 9afacd0a3fe260b0cebba05617299bcfb293863e37834a3637072312bb678be76f3e717cfd18beb31c6ded90eec088dfad1fa41d4f92f9bcb050379d5e9b65fa WHIRLPOOL 5dd1213fb8bc6eb064abf3fc5ad155e6edc9f484f272064593587d959592354db680cdf0edcb87f0629e601eaabd0d442e6e7372919563effa2426b0acd7fdcd
-EBUILD xbmc-9999.ebuild 8723 SHA256 cac2abcb2d6f9a2e8d40f6be1234795fcc4fcd800d2a3f63200e2d5b0b332e50 SHA512 8c740bb1d27f4a397e9910f15107e0cd4011999d430bc78211f47458c9b40cb433abd45cf937374844aeacb5bda1a64bc241257eb368c33cd4da02c55ccbed10 WHIRLPOOL 0270f1dbc5a145a45807093ecccbcd94a7a3b84b27ab24f5e486132d3c4d45b042422b468d187724b9547ccc0e6af28debca7c56d4424a3c35ddcac35344712d
-MISC ChangeLog 32909 SHA256 e1b5c28843f27e556c3378f665399d3696545d544cf10bc95b59bd33522fa3fd SHA512 da7939cf69e8ecf6489d0c9eb27add8d060fb81201e5af13dc94a766ffeb052ee24ad2bde0060b889571e8ad91086dc550f31312e02e4c37ac45e79b22e346e8 WHIRLPOOL 7cb8ac8a2edb419c5b2f080ab90585df4a7ff371c6c23de2d6013679521a5cd9fe68e89058f4c7dcfb1f0687291dbc3a656023492cad88cf30d57d6a429fd997
+EBUILD xbmc-12.3.ebuild 7125 SHA256 637714650bb5e32297b35ea884a0645df0cbfa8dcdc6ff420efb41b4036f055b SHA512 128490581cbd887a184a5adbf4b98b7ab444c12cb24c723c784e26cd743f00397c11b473a7758275e33759d4eb6914bc86af3c8312a016b5f2e4782b88793ff8 WHIRLPOOL ed6a5cdf44aa317a0a21dde3c0212fafb30201bcfc1e3ec846f21af7e850a374f9f8a93ffb599472eff59f590d0609b6c185e40c6164ab8a83865215ec806fec
+EBUILD xbmc-9999.ebuild 8899 SHA256 34e765d5780361900b5495e0bef1bb878412553f9d26fbc37183e17e03062e81 SHA512 c5ab1b369444cc5345a1b190dde036eac7fafe3f84abbe275ad7374b2ab55fe633af996972a053c9805f66031c8d952fd617d6979bc51e56dbce90d0a2c51f90 WHIRLPOOL b00b7dd6be537a468e3ca24452401598097293b5f441ae98c414a5d6fa19ab7bd8c101a3da9564009ddbc7163ba56b9fe5c0a2f6f5b0a47e2c8cfaa4ace9123a
+MISC ChangeLog 33041 SHA256 aba2742f8d6095b75a963ad91c640da85511b3616776f6edd4f01306c01c8b23 SHA512 ca4af577d2134b4312412be878fd99c8a1e71460765ff1b4d7ea4a5118b35e8d6910c8f370d160602968a8b4db25dbaf99f6404443f5276542e35dd18647a85b WHIRLPOOL 5e508e5eb4444963ea976391795796fcddc4d6911500cd22b4977ede7a1c1e7b7177de2d2ff20f1980b6aa69228c1109b54756dfc690e86bed4dbcab0deee01f
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (SunOS)
-
-iEYEAREIAAYFAlJ/wKcACgkQX3X2B8XHTokN5QCggCBvtIs5HVYi/hRnPxZ+Cj7C
-/3UAoIEI1blBhCaf0PxdbW65+V5mO8aB
-=UwPu
------END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 630ca1e7a4ac..593c0147389a 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.151 2013/09/05 05:06:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.152 2013/12/31 00:30:11 vapier Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ case ${PV} in
 9999)
 	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
 	inherit git-2
-	SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
+	#SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
 	;;
 *_alpha*|*_beta*|*_rc*)
 	MY_PV="Frodo_${PV#*_}"
@@ -133,6 +133,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cmake
 	x86? ( dev-lang/nasm )
 	java? ( virtual/jre )"
+# Force java for latest git version to avoid having to hand maintain the
+# generated addons package.  #488118
+[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
 
 S=${WORKDIR}/${MY_P}
 
@@ -195,7 +198,7 @@ src_prepare() {
 	epatch_user #293109
 
 	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -print0 | xargs -0 touch -r configure
+	find . -type f -exec touch -r configure {} +
 }
 
 src_configure() {
@@ -206,7 +209,7 @@ src_configure() {
 	# No configure flage for this #403561
 	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
 	# Requiring java is asine #434662
-	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
 
 	econf \
 		--docdir=/usr/share/doc/${PF} \