Version bump.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

3 files changed, 139 insertions, 5 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 43c6daee96dd..f9df7a7141e3 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.62 2012/11/07 17:52:23 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.63 2012/11/09 15:46:59 billie Exp $
+
+*projectx-0.91.0.05 (09 Nov 2012)
+
+  09 Nov 2012; Daniel Pielmeier <billie@gentoo.org> +projectx-0.91.0.05.ebuild:
+  Version bump.
 
   07 Nov 2012; Daniel Pielmeier <billie@gentoo.org> projectx-0.91.0.02.ebuild,
   projectx-0.91.0.03.ebuild, projectx-0.91.0.04.ebuild:
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 8a871e3518d5..3de29774a1ce 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -9,18 +9,20 @@ AUX projectx-0.90.4.00_p33-xdg.patch 1062 SHA256 3cfe281805420ec64cec6b571c7db7a
 DIST projectx-0.91.0.02.tar.xz 773968 SHA256 01b990cb5509fd426d961b0a51f736505c963472c1c9c316e168fd3fe5eda8de SHA512 72eeabd87c323eb4f53ac1234c3e4808af207456525fe20df3f7a164e1425a4cc29ab55f5cab836c51bad0a4f754e0b560b079cfd949c311f57516c03b62f8bb WHIRLPOOL 76b962dacc18bcbaa8bfe2c035fa643dd583153fbc7650fd6473fa2f39a948967bff59042b0a0cc1cef6119f68d5b356fbcded0836c0fc8e6cee32c376bc963c
 DIST projectx-0.91.0.03.tar.xz 774060 SHA256 f20adccd556e4b7af3817932bce10c268f55e1e9c8e9a0fa9760f06edb8158b3 SHA512 67c83b52ecb39d3771a5b49d90beb6c40eefcefbdd81602fd436c0a1d10cfdce17c010c0492ed0c9807d92ba72d770ab5a15dd7124264940bd7f41a66bc05687 WHIRLPOOL 55461d533e4aac732fc48b648417b5a6ff6ebcbc01f89d9e36cdb4c7d32a80db160775de004117e030d5537cd766aa0624cc007977302fffbd59937f4df49362
 DIST projectx-0.91.0.04.tar.xz 776092 SHA256 947c00262041d9fc266f275cff1dbe5711ba876689fd09347bf8e64cfd63d31c SHA512 bbd7f2a668728f797326f184faf903a9e70f9a46f693fe410952e7c27cf6cc81e2dd750f3d5a5ae6359fa3dde3a447a6736905e6ab4f26731475aceb16618583 WHIRLPOOL 5d310ab82232ec5be14d9949f065c3c05fea9531c61c2404b57b08b25bdb06b66feacb25337966d2efa7b677fef115b2a70d09253d81c357f16727a211443ac2
+DIST projectx-0.91.0.05.tar.xz 776408 SHA256 08092a8cf0f80250b24429a06d5ee55a2f80efff2efb48cefd7987d620560f7b SHA512 ca8de15347869a0074fd2c24f310aea2b7792ff8fa4695f475027c8e82d85df0c0836755e19dfdd99f76419a3a93999e2029c969e16c48748f365d833dfaece5 WHIRLPOOL 75d3fdbe29212bf775823f7c2b1aeb3f5f1ebb840e6da47dfa6bc81189c771c8bcfd70829261869a70ecc09c191e6d66da0302651c5b242a3dfc3e1bacb6306f
 DIST projectx-icon.png 1692 SHA256 0736e4320fbdb211a69e839b768175f18b0b2ef91636a9b382b4024a095dd4cf SHA512 33d9e505140d2dd22d34f87ebff040530130bbb7d1e9958d7345f442bd3d6e17dff8d243e22f374217aed20139871e406e46ca6f03ca48eb338dc3630af2417a WHIRLPOOL f88d7ab5cad4e5dfb893efbaafdc64a518a5f473115f9ef3e9f8a808f88ee71b22c6fbc6fc3a2e8a1885b2b9696ca0136c05d4f4d5cd513dacc6c4851c304f33
 DIST projectx-idctfast.tar.xz 12444 SHA256 d05b86b05c4924b434a6a9bb443c05d5421f6df7a2b19616a53ef1e4b4dada45 SHA512 85dd6dd0011c166aaefd47a47c4455dda68ba6da65c9eda5a996f7d078ce3900168714c0c72c6250f7b99181fda84c6d81e3afb392ace9c12c3c5690de01c1d8 WHIRLPOOL 0a44b37eaf79be8df356a6bc7bc1119bee151c6f7949a09f8b834bd785e242ffda907fbf36ff83e182249f450d835ad58cf3a81d6dceb404634cb01474ce908a
 DIST xdg-20100731.java.xz 648 SHA256 b6a189323fcc25ae5bebc006d870b4191a3bec34c80de7e337e5ed8a39f332c6 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b WHIRLPOOL 8a79fe5a73fae9662f0c74d293dbbe43d034484601649f170232e1b79ad0bb337fa8a6b3160683839893cc9e83171ad77e645fc64724c75321b02ef9f47efc85
 EBUILD projectx-0.91.0.02.ebuild 3636 SHA256 7fc2274a9f0840c5b6a9ce7f81ec9afb674c0af0d7452ba4246d327b663db272 SHA512 7cd14c3aa64465581d03dde3b4a23819fc92d5862445fc58f9918fe4a0922fe164b35522110bf8c254fdfa10c03a3c142356fce572d39b9b237c30bb7baf4241 WHIRLPOOL 44209e82a20046ca516d7255564b6679c4a7f39688189fe9b24e20fe5862eb5c568ed337532ce67ca07fa06651b46cd9f79eface5a2adc26199ff304aa63b0f0
 EBUILD projectx-0.91.0.03.ebuild 3638 SHA256 34fa53875222d31a1e276fbd91978cf0edc145455d20d7dd7c47595a0b819b67 SHA512 41db267fc3f1806396a5447fc1768eef2567505e65e0d7d00567c2721012517af7173338ec2bcccd6d38ec5827f3c4ea3c7667f2c33f3ca1b4d7ae151740766e WHIRLPOOL 1cb84dd48f5d45d1fce18736c9a4c3aa049f287dc3031c83459511fe2264383ff2de1bee1539e7a4f112d05855780efb5a91b72ec5bae7e659cc98de4c76f118
 EBUILD projectx-0.91.0.04.ebuild 3294 SHA256 2f7af1c6c7c1f3abaad193fe94c0c21259fd2540a4586b49f5f4c42e7a1dc72c SHA512 efe5754e56c2827017f129987616c921c470eeb384e88216f0165db4955bcfff88115bbf54d152174f3f10146e71942caff837372969123c909223701f661a23 WHIRLPOOL 5714b4234efeb32af589f6fdb86d287e3410b9a7564a84285236dc397e8a80c940c2a7e33a700864af652d4e3abef95ac9ea7bc4fd9c1ff68c71d801e9877b15
-MISC ChangeLog 8278 SHA256 e594dbdcaff3daa3381a7413f073518cdc62db05cd1e6dc81836e176800d4ff3 SHA512 bbf916dcfbf8e36dace8edea89de53d937c45800321f0edbfaf8c85ef56c10483f93d7cbd5279b7a9be1d9f4a6157deedb186473f5e5347d4b467ee9527d1fbe WHIRLPOOL 957ccb3d5ad2c0a77042ec268d94a4e451027194cf7e76627637b5d36094b54528e0eea6812e6f1293c62abf16623110b54e3b55f334447bd4eded7b0a10cc68
+EBUILD projectx-0.91.0.05.ebuild 3294 SHA256 ede491877ceafa31b5d2bb9154a44d9a89b6d485608348adbd31169ee4dc9da0 SHA512 c8b717c4b7a8b87152e582d28f96b0745ffd7329fed9d1e35f7f4f6ae4e10a1edfb188902e899cb42c8bb36d1ab003e00dbb0e7c90797dccdc483aafca7e6f6f WHIRLPOOL 6f1b0c857161a5eeb56a80c71ae0fb196b77363685e0a9eca5fb795cec3394c47e79be494db7d3abfbb51bc06b3a668ba8c5a146eb383c0ade39e7fd4e6ca77e
+MISC ChangeLog 8410 SHA256 0d224a10a4e4af4ba9253ab44b3cabc6e853421a271c3f2173561b05ab5ff2b3 SHA512 bd25b8a678b4e26f5b908e98eda4b43eda38cff7189037f7e743178482a15c83699021cb19a6e638989de68c458e2bbcded6637b7fed7e3370587e00265b895e WHIRLPOOL 4f878db2c4bf969531edcd0544674bb3f54f24a5543659aabcf65726d87f92a7d0af99bb20d947d9e3c4b25a5a67ff2d044f12652956db339275b4a120ace164
 MISC metadata.xml 648 SHA256 02f9b720480dac25585b7c9e5f8c39caf0560bef841f75788215f2dbc28a3940 SHA512 f3e516bbfe4731929d74f2cd38aac6159007a5a3850e3f3b52f52b7b56dd896349e823cf0d2fb0d5f831fd24b311fb69e8e59a549f45d0f68ceec133a55a0955 WHIRLPOOL 1817bdecfdf4b994fcf7b9bd4cf7ef40187853cc8464b770047d30177e1cd5d590892d4f3b4e454ced7cffb97f1f8548b8c48337de8efaf989604b0bddea614d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCan+QACgkQlcuUeyFa0U1hkwCg875MwsUvle4X2eMHfy+5CJyz
-B9MAnjuZ3URlq1wCSVRUP6ib0pcnu+c7
-=rwnq
+iEYEAREIAAYFAlCdJXoACgkQlcuUeyFa0U2OMACg5ZYIn5eZRkYZTacqSmyo9KE7
+HmkAn27wg2+QfKqqEdgrDywTr25RIdmQ
+=3ese
 -----END PGP SIGNATURE-----
diff --git a/media-video/projectx/projectx-0.91.0.05.ebuild b/media-video/projectx/projectx-0.91.0.05.ebuild
new file mode 100644
index 000000000000..c80ba7509a1f
--- /dev/null
+++ b/media-video/projectx/projectx-0.91.0.05.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.91.0.05.ebuild,v 1.1 2012/11/09 15:46:59 billie Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils toolchain-funcs java-pkg-2 java-ant-2
+
+XDG_P="xdg-20100731"
+
+DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
+HOMEPAGE="http://project-x.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~billie/distfiles/${P}.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${PN}-idctfast.tar.xz
+	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz
+	http://sbriesen.de/gentoo/distfiles/${PN}-icon.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X mmx sse"
+
+COMMON_DEP="dev-java/commons-net
+	X? ( =dev-java/browserlauncher2-1* )"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/xz-utils
+	virtual/libiconv
+	${COMMON_DEP}"
+
+S="${WORKDIR}/Project-X"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
+}
+
+java_prepare() {
+	local X
+
+	# apply stdout corruption patch (zzam@gentoo.org)
+	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-stdout-corrupt.patch"
+
+	# apply BrowserLauncher2 patch
+	use X && epatch "${FILESDIR}/${PN}-0.90.4.00_p33-bl2.patch"
+	rm -rf src/edu || die
+
+	# apply IDCTFast patch
+	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-idctfast.patch"
+
+	# apply XDG patch
+	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die
+	epatch "${FILESDIR}/${PN}-0.90.4.00_p33-xdg.patch"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-0.90.4.00_p33.xml" build.xml || die
+
+	# patch executable and icon
+	sed -i -e "s:^\(Exec=\).*:\1${PN}_gui:g" \
+		-e "s:^\(Icon=\).*:\1${PN}:g" *.desktop || die
+
+	# convert CRLF to LF
+	edos2unix *.txt MANIFEST.MF
+
+	# convert docs to utf-8
+	if [ -x "$(type -p iconv)" ]; then
+		for X in zutun.txt; do
+			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
+		done
+	fi
+
+	# merge/remove resources depending on USE="X"
+	if use X; then
+		mv -f htmls resources/ || die
+	else
+		rm -rf src/net/sourceforge/dvb/projectx/gui || die
+		rm resources/*.gif || die
+	fi
+
+	# update library packages
+	cd lib || die
+	rm -f {commons-net,jakarta-oro}*.jar || die
+	java-pkg_jar-from commons-net
+	use X && java-pkg_jar-from browserlauncher2-1.0
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	local IDCT="idct-mjpeg"  # default IDCT implementation
+	if use x86 || use amd64; then
+		use mmx && IDCT="idct-mjpeg-mmx"
+		use sse && IDCT="idct-mjpeg-sse"
+	fi
+
+	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
+
+	cd lib/PORTABLE || die
+	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_doso lib/PORTABLE/libidctfast.so
+
+	java-pkg_dolauncher ${PN}_cli --main $(mainclass) \
+		--java_args "-Djava.awt.headless=true -Xmx256m"
+
+	if use X; then
+		java-pkg_dolauncher ${PN}_gui --main $(mainclass) \
+			--java_args "-Xmx256m"
+		dosym ${PN}_gui /usr/bin/${PN}
+		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
+		domenu *.desktop
+	else
+		dosym ${PN}_cli /usr/bin/${PN}
+	fi
+
+	dodoc *.txt
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}