Version bump.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 228 insertions, 5 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 71587023ea4a..9454f66991bc 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.695 2013/08/27 20:33:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.696 2013/09/25 07:57:15 ssuominen Exp $
+
+*xine-lib-1.2.4 (25 Sep 2013)
+
+  25 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> +xine-lib-1.2.4.ebuild:
+  Version bump.
 
   27 Aug 2013; Alexis Ballier <aballier@gentoo.org> xine-lib-1.2.3.ebuild,
   xine-lib-1.2.9999.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 052c2d06f820..81d99093b202 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -9,16 +9,22 @@ AUX xine-lib-1.2.2-libav.patch 498 SHA256 40659374fefbc69f81e750a8b852cd9d701b40
 DIST xine-lib-1.2.1.tar.xz 4843584 SHA256 2d4ff0d275b46a197c6a914fdef154e9dd4c88b383f6e1f5efbb8d47a8e03d4e SHA512 f1c0d1455699efa12b36b568071099bda3d6d14df3f7de958a3a03637a1fd6d289def17812bcbe726ddc05887dfc50cd99e49bed9756a6a6bac0a66a01a869fa WHIRLPOOL 395ba140292b50f5229316dd3a1765b13cb81235b9c405e2387e567ad0f194a62930c9bad66bc18fe211edb2b7324f2e6a6ed4a5f2b2e9d367d96d22b3f6eae6
 DIST xine-lib-1.2.2.tar.xz 4857248 SHA256 e1656451be64005ef296ffafcf5085d63ef7d4ee4477024391f8e3000d3253d6 SHA512 338916386adafda85bafef0dae862c49470d7b6ccf2d8c83ada7ac2f50d12746daa0ebd3ec3fd68e063e20a1f86b0508665b3a49ba493e7fa9abf22f17bd8b81 WHIRLPOOL ad43547eaa173ecbff9ee6951a484a152b273f9441a93f728d31043e1a32a0c79b8040ec28a27986216bb77c981867e13370adc15971191c6121808e4fc2c56d
 DIST xine-lib-1.2.3.tar.xz 4905356 SHA256 e06a9e01d2632530e694d4a96bba71810e2f447f9ac036d2a150c43baa27852a SHA512 1abbced7c67fe04492bb28ada9d847e82be4bbcc426378dae1056dd6b01e22b8fa78218f5a96a0947ff1e9f70ebc1ee4bb06c330b0e17ca8d7c4d9be49982887 WHIRLPOOL 0e6bfb61ce77d14fbd0a807499b2a0b3f04ac976e8b7c06a5b34be06cbecb822339451031b80c4dc8faa5265adb1883861d96d0e7dc43a0b3ebe7040b619fb65
+DIST xine-lib-1.2.4.tar.xz 4954992 SHA256 9c5b1b4ef7bd0591962c322a3afa709eeaa5bae664678548f1340e64f43abbdd SHA512 ac6b433aeda0a5f39a9f96e74c03cb904bdf7b938c0e81769ffb7d5db70812907d869708c193a3d508d57b2b45dad86c8e1279e73dceb3a24573fd1fda11f898 WHIRLPOOL 0b4ed7a05e36cb012d47f8f9133a0e199c1dd7c6ec1f86cb1f9897e68e6801a300283cefa4ba6a2205f664ce220f72157f0b5e87afee887e01be8cb05a20bca1
 EBUILD xine-lib-1.2.1-r1.ebuild 5196 SHA256 5b26cb155a41b9dfcbd3e383a68f52bae8978378814cb51746a264509b347af6 SHA512 48787bc3d0d6c419444ec502c578956e6cb46d2a7ea3467b59971e6d055301dc40038edef71fb42e64c18aeff3ab738a1af4d983840d571388fc3b747f325375 WHIRLPOOL 963f4270cc2c5bb1ebbd812a0fff63ec735b250b45e3d544eb6dea41cfea72e4f72f815208f852079866a49b6a548c863ed7747c85bb938c559afa668e293134
 EBUILD xine-lib-1.2.2.ebuild 5371 SHA256 b33684de4a664ad72feb634d8353cf6204ef3dd152d2bc99a7ebd0436f347922 SHA512 f8afde12b8358b7cee45d9372d54204acb505cdb9de39ae4f3574739bf49f90c29f5c8fbc6ad1677fd741f49e95b3f9f323ba1200ed34b9612da07b01e603de8 WHIRLPOOL e897edfdaab50336331ac67a04f3a0e26d0ed7293ec91168833c44b831e3d30784b9e206b4967d0a33f89fe97a54608c5f6516d687cbe1bd47e7ee88461a2347
 EBUILD xine-lib-1.2.3.ebuild 5507 SHA256 1271226385f590ac39da8b9767d0cbc7b9e5d8e6e73ca0fea214ea42f8a7ab91 SHA512 f1cc4f4dcd72d2fdd519673be4cdb32a422de96e1b26a418f5a630572236816519aaabbb9d5dfafe9d8229d6b7654794e32d23dd62e376f9ede87b44332b3ae6 WHIRLPOOL efe0ac14f17e6d01127c6078f781a184aad12c689041aef09578d921e6e89756d7915a49da8b31981bc3e757b20f6c7168ef06524ca728793e7f6b06f92013f0
+EBUILD xine-lib-1.2.4.ebuild 5458 SHA256 2ad12ef6f4b8b5d87cb2ce6964d529eedfee0652cb0897acfe3d7dfe84319dce SHA512 12c97daabd538ccf6b745f7480606544df6e868e512fb8f161a02b64e6ef5663cd9ad9c790485538d3a3b8f744ae75fd20fd46cb1f0a4503f3e2947b39a0010a WHIRLPOOL 45ae131afa10d149e7feb39f3733df0d8d1091bcc941fd09cf495b12a0aa06c7fe17ab2d95682be6d3826fda5eac62a40f586b14eeb51a4cd91dc190ca51cff1
 EBUILD xine-lib-1.2.9999.ebuild 5461 SHA256 07fc4d43bf9416c1ad95f0a022100151bef145cffaed2482b6e84a8d00cce9b4 SHA512 962996ad6f62b836636c5af409c7c7bb1c67100a10bdc694a4ee6ea751b6e081d787a1d0e954a41729accce14c4915e70ae12ebc437d92d6c56d3df80a7b5345 WHIRLPOOL 6aeb01758b9221f346350af63837d26324101ad557b39493bc90201075e1d6dcefbd2745ead3a6b350458916d6ce3e3914514984a4485ea7f1e2fb6fa55ccfe8
-MISC ChangeLog 82385 SHA256 fce503fdc3a755b0d377ece8a15df50ed21a08af1d99bf9b4fc299d429984e39 SHA512 ad0ce1a7afb900f17690fb7ffd86a7a33ef534901e7a67e706e484f36c4058a574acb9d02f47a9387f3e26458e4aa29b529cf2227f3e208850d9bfa7101d4714 WHIRLPOOL 000209d61e92f6b0bca9d7fbd1fca3ae17957051c9b014a8ca63a4de7b955dea29729ae5153ea0e2ba5322abd1fd4ef6dbfeb05190ff1ccb1ac58dad65144f8f
+MISC ChangeLog 82512 SHA256 608d120876476861f1c6525f0fffbc41e47f1f1dab9a1829ed3ed407ec5b909b SHA512 e2102afc290a219536de3eb640ebfec96cae6f70afbff3f686170a8c0ef2566c4eff9a585bcb32491e8fb8a8509f3f216c09930efaeed73ca41b0f7f7c3383a8 WHIRLPOOL 801ccfe973330dc2e6cf96f2bae1bb88c17c897c156f54f4a6ffd19365bb2cce089451b6badcf6877e8f1ebaaded36bcb1eefaf42ac5b67edee966be3de7c5f8
 MISC metadata.xml 2609 SHA256 543e9397dfe80dd63a1ed1e0b242d1f1eb7cefc61fcd8152f7b08eb9b6d3ac45 SHA512 ac17d1baa9356003e2ca8770d635705f51e9e3a246ae275dbec17f8d14b802c4ce4b9441281e12e2fb636a3c7d4d734dfaf666f1afe5494ffd0628967c831791 WHIRLPOOL 567014d0468d724c033995e2079e3e569ba1a56a9a2f4642bfc6a346e8c11933da0c0b0abfbe8299af41cfbe88d9265e6c4939070a36d6b477d058bcb8f8a159
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIdDRMACgkQvFcC4BYPU0pOoQCfRW45wVzRNCa9krFD6zrj0wqU
-dlIAn3Etaa5x2vfpKrhlvlSrECTN8se9
-=PRQo
+iQEcBAEBCAAGBQJSQpcSAAoJEEdUh39IaPFNvjUH/0lqGZKtZmmHXT4dnIk+24ov
+poWr+9h40n5kMeKY2UaSZVpgRLO18gzMeH2G1gsag/zb7ZwQrMS6QV5tDjDaC0/y
+AM/Qnf/7UgAg+AS/tW1xUyIpAuWudQ0pITczfWyQRa9SW3l41T8Gc86mP0c4rPM9
+a2IAj0ga44ZyyWzRWVn9Ht2QPnYpqVEWAObmTlxWxBJ7W6RHsvKmiN/fkQ03l3Ai
+Gx3YGfOna6iGUrJw/A6CM1GEch+YBnKGyN4ekGqoFZNDflN/27rJ2aGP4vEFi33d
+I388Tyl3rjBIRSu1OS2YXNamCY8xbypKfITbvIUG5HBvTvZtHGqgP1OH8mEpUyQ=
+=yNHX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.2.4.ebuild b/media-libs/xine-lib/xine-lib-1.2.4.ebuild
new file mode 100644
index 000000000000..4b98442c02cb
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.4.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.4.ebuild,v 1.1 2013/09/25 07:57:15 ssuominen Exp $
+
+EAPI=5
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	inherit autotools mercurial eutils
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	|| ( media-video/ffmpeg:0 media-libs/libpostproc <media-video/libav-0.8.2-r1 )
+	virtual/ffmpeg
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	fusion? ( media-libs/FusionSound )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jpeg? ( virtual/jpeg )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio[-minimal]
+		)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	wavpack? ( media-sound/wavpack )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		)
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
+	xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )"
+
+src_prepare() {
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ ${PV} == *9999* ]]; then
+		epatch_user
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf
+	[[ ${PV} == *9999* ]] || myconf="$(use_enable nls)"
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable altivec) \
+		$(use_enable vis) \
+		--disable-optimizations \
+		$(use_enable mmap) \
+		$(use_enable oss) \
+		$(use_enable aalib) \
+		$(use_enable directfb) \
+		$(use_enable dxr3) \
+		$(use_enable fbcon fb) \
+		$(use_enable opengl) $(use_enable opengl glu) \
+		$(use_enable vidix) \
+		$(use_enable xinerama) \
+		$(use_enable xvmc) \
+		$(use_enable vdpau) \
+		$(use_enable vaapi) \
+		$(use_enable dvb) \
+		--disable-gnomevfs \
+		$(use_enable samba) \
+		--disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \
+		$(use_enable vcd) \
+		$(use_enable vdr) \
+		$(use_enable bluray) \
+		$(use_enable a52 a52dec) \
+		$(use_enable aac faad) \
+		$(use_enable gtk gdkpixbuf) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable dts) \
+		$(use_enable mad) \
+		$(use_enable modplug) \
+		$(use_enable musepack) \
+		$(use_enable mng) \
+		--disable-real-codecs \
+		--disable-w32dll \
+		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		$(use_with X x) \
+		$(use_with alsa) \
+		--without-esound \
+		$(use_with fusion fusionsound) \
+		$(use_with jack) \
+		$(use_with pulseaudio) \
+		$(use_with libcaca caca) \
+		$(use_with sdl) \
+		$(use_with xcb) \
+		--with-xv-path=/usr/$(get_libdir) \
+		$(use_with imagemagick) \
+		--with-external-dvdnav \
+		$(use_with flac libflac) \
+		$(use_with speex) \
+		$(use_with theora) \
+		$(use_with vorbis) \
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
+		--with-w32-path=${win32dir} \
+		$(use_with wavpack) \
+		${myconf}
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		htmldir="/usr/share/doc/${PF}/html" \
+		install
+
+	rm -f \
+		"${ED}"usr/lib*/libxine*.la \
+		"${ED}"usr/share/doc/${PF}/COPYING
+}