Migrate people to the new kodi package #526992 by Rafal Kupiec.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 23 insertions, 295 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index f3a2fc9f1713..836ffe434def 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.225 2015/02/16 01:05:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.226 2015/02/16 07:38:54 vapier Exp $
+
+  16 Feb 2015; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Migrate people to the new kodi package #526992 by Rafal Kupiec.
 
   16 Feb 2015; Mike Frysinger <vapier@gentoo.org> xbmc-11.0.ebuild,
   xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild,
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index ec38d55b8cf9..ee577c566094 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -34,23 +34,23 @@ EBUILD xbmc-13.0_p2.ebuild 9286 SHA256 1af586d28dfdd1bf7364484df0aedcd16f9c94f47
 EBUILD xbmc-13.1.ebuild 9222 SHA256 d36ed423acd9024f13addb1bb3ac8da8a3a3a68469d17be6edfd0fe2353f31aa SHA512 1232ada2d57ea9f573b86c83ab1b3da7a848f5e802be68a278cd82452f4add26383d7421637ae3fe68a57d2eec38ae034d1caf8291aa209c55e0bafad4d7c804 WHIRLPOOL 6974466b23cdf26bf7e75cba43433eba1f6bd3397538da98a5f682b401cca99f37a6c83ef5ebb3eac6aaba88b845e55da32095ebef191171908d9bdc1ca40c5b
 EBUILD xbmc-13.2-r1.ebuild 9221 SHA256 270f0d82f957c4386a7f6d66ef9c58f5ce957fc94135af0d7d6a0e21c9d063d7 SHA512 7cfc70ad84f9c48d12604fc0a5a9a990d67d775cb87a3da55eef2d5cce62e3420ba8ba39c7901a9f51c8f1abe5baf61f3cbb903a4639e82e3138100d10730035 WHIRLPOOL 473b66f3462ff66e12dd140772813f651e74f74a4c23a67a85ac22d3ca8446d72227bd13cae973123aed994fc11978e08e6583442f90d95824cd977cb8e54690
 EBUILD xbmc-13.2.ebuild 9222 SHA256 a78d255e5bb5fbe1d77cfa3f24780a7f5b939cdc6f3a8355b4454c824c877f37 SHA512 1b7c5d8f15deb54c0f99c31ee65ca7a45f29b0cd6cedf3e6baddbcc2a52faad615d7f106f62bdcad69f9f866f4c35571aa8f501ce8d9bb91ba1d3f183efb9583 WHIRLPOOL 1788f466c788fb1088ba09ad5e29bdacf9e42e82eda201b1176818f772ad27ef84316ebea4063864cc1a0a269e0eb79189db29b76f8e3c0ebb4b904f7b81dc98
-EBUILD xbmc-9999.ebuild 8498 SHA256 b7ac7b3128d821ccedb0546d17fce8b9c10560dfe4a3028a616128fd772be40c SHA512 44476e3e5f7751a19650d4c128f1d7a01459bb504b3625885cd2698f1bff8ca0dd8234d8e503a07cc4d193420de556169cc179afaa2fa5035bff223416f9945c WHIRLPOOL 343ab3d677f16c0ed6264de8ae1e7acf458d81e7ec9eca2f11e87a081630a149e66a4e18de08dd6bf4093f3e415ab79bd4d34ef9b97bacdcec115eb4fa18c0ef
-MISC ChangeLog 37569 SHA256 b031d6adb3ecb5542c8306d7fc4b9ccaf5ecb518865978eab7ec80ffd081d5aa SHA512 c108ab0f4fb9411964ad776a38c38d65ea5e20e4515ead3be774d9a91860f3e7632aa452945955fa3b787faf6339d2fbda94eb096439cffda6e9632ce5d63a75 WHIRLPOOL 896dc5a44c1b04d15ba8c0f6d6de2739ac504073cea599ded8666f1772e34ba8e617ddd422f90f9c9a94061eba09298136ccac8ebac3d6790dd586582dfdf693
+EBUILD xbmc-9999.ebuild 388 SHA256 34463869664de36004983b010216024939549ab24cee86529ee75fc76e5ef6c8 SHA512 83e4cb03dcc93d07d9302d9a4f4f7043d25bfbdde6fba64f349cf5a41b2ed1a4aba2e82cd223455a672c2324918a0b634c5342a5487c952418e467c1011226f7 WHIRLPOOL 80f09d02feaf9296f6db6966efed725aeaef235fa45ea63eeeda9b4299d79d003a63874ec8dd5d7223f8cf366476c3f3b7d8eb99a59bff67b8a96eedf8d536b9
+MISC ChangeLog 37704 SHA256 02821a8c16c339c1946933802c726933678f523f7d49812a8ba279775842270d SHA512 3fc5f53b78a7e86b9f74cb9da2c3b7e210e103a381cbb018761f61f0e16a1db069b61908f8a35320d0d24b3571ebb9b75031a42e99af1141564d6c49d5d8f7cf WHIRLPOOL 411f95ad369c2ae5f26b4c307fe52c0a147a13446354d4ae070e655c88ef5d52f11fe923a3ed1657ff09d52b11bc2e0e93b0c5b8149ef5e703651af216fb3769
 MISC metadata.xml 1164 SHA256 f8e32d8b3a4347b197b5d1c6e983d6928b6516c437ab8fccb9d910c6f58c107f SHA512 49f19f115cf306447afa87c18724d717dc7b924b65b0fb4f5d55212b4d30650e28217bba4d848a786ecefd18622c89244b2f70e89c246372e4ce723f9932c76f WHIRLPOOL 6a905fce5cc388227f8f2ee471a198cabdd8dc203d52d21073c2a1999bbe12cb1620d693aba4468f88982a2eb3b876c912ceb710b615aeecaa92dc9bccfc7af6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4ULfAAoJEPGu1DbS6WIAtWsQAJtbJAz2/s/eBUzqIu9vCtJW
-TtpyvJtwZG5+AXjz2QJKJ46yvzWlTtcmAlX3pKRpd1wFG9WYXGZSgUet92wWYffU
-4C0ZVpY72/gYH8xtl9IrOI3pAaM5GwXyDS7JSlMfRlBhRmucxvgFg6Ovz5XOWoya
-SFdV+4nW5menOMXlNjdwMtgRby98FV2ZZyKPOjTfDoxhJy5Lr75jlxaW4R5o0xmS
-j5G6D3vyCvFJzmqd9hI1RTX3w4sJ389GbRlLgVZFQNEaLS9RZML9WL3RxxI1J2d6
-5qniElek+vWqsOklfg4Hh377/ZTpsUgd6HVT6Dm6Fcxs5cL8UAGDRBjaraxZAIaT
-XjvaJVNmH90Eg+mBLDFW7REXhrQVMynoADOsAB7Hr/zrrGtRlVukJWT9Cv7vriOu
-9r+vz9FP5Hj1aAgNIqtQuo4jEB4COScgCVf09yclLIg+TYNMHAoyP1qUZ3lbeLTg
-3SzlEmKhEXeIPwA+RMqnh0UeNNqaruDPY1o6BxltH/sB86lEVm4rtZPNeOvFN26T
-u3DM6jNfHGXimcmBt/lVgO9SswlR/cSJ/oHtx29cBqzMkqCpZFg9xjWQJckzYu42
-0nB6sRT99/kqCvpsbv9M2VlbvOsoZ0ycbHCnuyis4aF+a3vQLH0TIl4WFzM9vrRv
-nB5cXRin0qfKed9pN4iX
-=hS6f
+iQIcBAEBCAAGBQJU4Z8kAAoJEPGu1DbS6WIAaRwP/3pxOqKABxt/WBpv7J0vImCI
+LKYKRLO9AvhAAluoRwKVOZxvbZNLbkIBBVMmL/6VoDtbiga2myTfK+/w43EQpxCz
+BJ1x0a765UsIpMopxGCCS2cuVn11VSpeFlNBEe5tbWnzDou/wrUTzqbMyl6EB1uY
+vq8g8Duy/Ndb/aTJQlECUnVbd5V3E9JauOt+KRXImaLqQabTv2irReG0mLYK7klJ
+8AKJdqFHX9LZf8N9gqY1HF7mhKzZlSX8+hvjztr3cMxCO+1iveGf4hGp0SAn0pFF
+ywegl03JT1DbGwXlgyYx6l44QLV9Gj48bl5a1DpSHQEEkr4dx5vjhbgH9xZl7PCd
+X4X4UpHVscwSXWBF/zti0JHXRRu5UxzPXPXhXPUSjA94CfGQjuAXGEWg3rIHpcfA
+8TSNY0F8tcjPwfDjh5xKBq6JwrUs15HCEKE+ytjNEt84ss8orftH57Q1bfnORi0w
+Un/D0A6oqxP6V1hrVGaAhQfkx+pUGZQ1gLI0gj/TSzCzZXQo0BIY3SgxXjG9Tz3s
+dyMC06USvkmwyiWQEMW1n44hCyOxC6CtzIXSZF7VTuWEflcLkmzf6wJG6yFdcGs5
+aQDi5W0JIPePD0FYqhPHz49nOqp0cLxsdHS7ZXA1pSBK9hsBAaNSLTuFEgWCMjSF
+03hQ3PR15g/K9nnz/Trl
+=ivTM
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 3dfe05a7e8ed..407bbb1300c5 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,288 +1,13 @@
 # Copyright 1999-2015 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.173 2015/02/16 01:05:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.174 2015/02/16 07:38:54 vapier Exp $
 
 EAPI="5"
 
-# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 multiprocessing autotools
-
-CODENAME="Helix"
-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 )"
-	;;
-*_alpha*|*_beta*|*_rc*)
-	MY_PV="${CODENAME}_${PV#*_}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
-		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P}
-	;;
-*|*_p*)
-	MY_PV=${PV/_p/_r}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
-		http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-
-	S=${WORKDIR}/${PN}-
-	[[ ${PV} == *_p* ]] \
-		&& S+=${PV/_p/-${CODENAME}_r} \
-		|| S+=${MY_PV}
-	;;
-esac
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+DESCRIPTION="Stub ebuild to migrate people to media-tv/kodi"
 HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
-LICENSE="GPL-2"
+LICENSE="metapackage"
 SLOT="0"
-IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
-REQUIRED_USE="
-	pvr? ( mysql )
-	rsxs? ( X )
-	xrandr? ( X )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	app-arch/unzip
-	app-arch/zip
-	app-i18n/enca
-	airplay? ( app-pda/libplist )
-	dev-libs/boost
-	dev-libs/fribidi
-	dev-libs/libcdio[-minimal]
-	cec? ( >=dev-libs/libcec-2.1 )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-libs/yajl
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	media-fonts/corefonts
-	media-fonts/roboto
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-1.5.6
-	media-libs/jasper
-	media-libs/jbigkit
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
-	media-libs/libsamplerate
-	joystick? ( media-libs/libsdl2 )
-	>=media-libs/taglib-1.8
-	media-libs/libvorbis
-	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
-	media-sound/wavpack
-	!libav? ( >=media-video/ffmpeg-1.2.1:0=[encode] )
-	libav? ( media-libs/libpostproc:0=
-		>=media-video/libav-10_alpha:0=[encode] )
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	nfs? ( net-fs/libnfs )
-	webserver? ( net-libs/libmicrohttpd[messages] )
-	sftp? ( net-libs/libssh[sftp] )
-	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	bluetooth? ( net-wireless/bluez )
-	sys-apps/dbus
-	caps? ( sys-libs/libcap )
-	sys-libs/zlib
-	virtual/jpeg
-	usb? ( virtual/libusb )
-	mysql? ( virtual/mysql )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	gles? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	vaapi? ( x11-libs/libva[opengl] )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		!libav? ( >=media-video/ffmpeg-1.2.1:0=[vdpau] )
-		libav? ( >=media-video/libav-10_alpha:0=[vdpau] )
-	)
-	X? (
-		x11-apps/xdpyinfo
-		x11-apps/mesa-progs
-		x11-libs/libXinerama
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	!media-tv/kodi
-	udisks? ( sys-fs/udisks:0 )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-util/gperf
-	X? ( x11-proto/xineramaproto )
-	dev-util/cmake
-	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )
-	test? ( dev-cpp/gtest )"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package.  #488118
-[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use libav ; then
-		ewarn "Building ${PN} against media-video/libav is not supported upstream."
-		ewarn "It requires building a (small) wrapper library with some code"
-		ewarn "from media-video/ffmpeg."
-		ewarn "If you experience issues, please try with media-video/ffmpeg."
-	fi
-}
-
-src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
-	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
-
-	# some dirs ship generated autotools, some dont
-	multijob_init
-	local d
-	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
-		[[ -e ${d} ]] && continue
-		pushd ${d/%configure/.} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
-		multijob_child_init eautoreconf
-		popd >/dev/null
-	done
-	multijob_finish
-	elibtoolize
-
-	[[ ${PV} == "9999" ]] && emake -f codegenerator.mk
-
-	# Disable internal func checks as our USE/DEPEND
-	# stuff handles this just fine already #408395
-	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
-
-	# Fix the final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	epatch_user #293109
-
-	# Tweak autotool timestamps to avoid regeneration
-	find . -type f -exec touch -r configure {} +
-}
-
-src_configure() {
-	# Disable documentation generation
-	export ac_cv_path_LATEX=no
-	# Avoid help2man
-	export HELP2MAN=$(type -P help2man || echo true)
-	# No configure flage for this #403561
-	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
-	# Requiring java is asine #434662
-	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		$(usex libav "--enable-libav-compat" "") \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable caps libcap) \
-		$(use_enable cec libcec) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable fishbmc) \
-		$(use_enable gles) \
-		$(use_enable goom) \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable mysql) \
-		$(use_enable nfs) \
-		$(use_enable opengl gl) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable sftp ssh) \
-		$(use_enable usb libusb) \
-		$(use_enable test gtest) \
-		$(use_enable upnp) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable X x11) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
-
-	domenu tools/Linux/kodi.desktop
-	newicon media/icon48x48.png kodi.png
-
-	# Remove optional addons (platform specific and disabled by USE flag).
-	local disabled_addons=(
-		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
-		visualization.dxspectrum
-	)
-	use fishbmc  || disabled_addons+=( visualization.fishbmc )
-	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
-	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
-
-	# Remove fonconfig settings that are used only on MacOSX.
-	# Can't be patched upstream because they just find all files and install
-	# them into same structure like they have in git.
-	rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
-
-	# Replace bundled fonts with system ones
-	# teletext.ttf: unknown
-	# bold-caps.ttf: unknown
-	# roboto: roboto-bold, roboto-regular
-	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-*
-	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
-		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
-	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
-		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf
 
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
+RDEPEND="media-tv/kodi"