Version bump.

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

3 files changed, 148 insertions, 5 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 27c54dc8e2b4..4b7330326b24 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.60 2012/09/23 08:05:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.61 2012/10/01 16:31:11 billie Exp $
+
+*projectx-0.91.0.04 (01 Oct 2012)
+
+  01 Oct 2012; Daniel Pielmeier <billie@gentoo.org> +projectx-0.91.0.04.ebuild:
+  Version bump.
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   projectx-0.91.0.03.ebuild:
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index a93873e48f76..999bf782884a 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -8,17 +8,19 @@ AUX projectx-0.90.4.00_p33-stdout-corrupt.patch 358 SHA256 b0aca3638faab72fb9f4d
 AUX projectx-0.90.4.00_p33-xdg.patch 1062 SHA256 3cfe281805420ec64cec6b571c7db7a5e1f672b806bb9283f653b3a04c874f00 SHA512 661c2577d83845464ae1669b401780ddc312857292e97c962f8fe52463d543b920e66b8ce779193b4ffa66a522f771d78861606ad1f7c915f4ce51fdbeefb3a0 WHIRLPOOL eee95af4350665760ff82e3db5346daaec5e1dbaaab0c69a1dd075f3e57997d13f40b49e370157bf64e6e447aa0bc82779c25629eb9dadd69029a0e657eeb710
 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-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 3615 SHA256 958f79b077d97fac83981c4a41474efdd0ac9ba9e392f4b440fb245bcfec277d SHA512 3b10da281e8ffe004e10642acd978662bb08473ccd5d3d50793aa86226cb32ddfe5e8d32fdd86143373f636c96a3ba71b0d4c0c0efdea85534513fd266795372 WHIRLPOOL 55b9537f5175191e5c3473f7a55ecb2d01a983ae6153992e9f9601514b222a935d25bfb1f1ec5685722b6d2adc0c815f11cc036c0f0617a711872ce5a0d5d7e1
 EBUILD projectx-0.91.0.03.ebuild 3621 SHA256 5348f6d6b4254b634c6ee76abc6a85a26067bf7c06fd801bb7be515bd2c55ee0 SHA512 d5ebcb5fb113075cac10fa5e6f0baa3c816020c736385ec0a27dbe87f29c3ab3048732615ee38b63551ec658f61f63469ba0a2129d5dc97d957a8d8a9beaa2e4 WHIRLPOOL a88b6b81625d371eb31d163796c9889077aa1cfc2d6d698db38525ddebbf6dd07ebc700c0ddf4e3eabdd254f43ce79e3848d7f6f91db4e5bd88c7cd41333a7ff
-MISC ChangeLog 7726 SHA256 762416abad5ad0189f9dc4fa8024bbef6171f096a6a196959fad496c64a334de SHA512 62b855f514ab9f2c4096365f897d75a0caf595b67da6f958e1f42a4bbbd660b990a81d483fe5d68331110c3240e189e10401f70d0b381493261e7ba0519b5c5a WHIRLPOOL 1cef2385fb143874ee80838fdae1d7243f174869139ee61735ba1ce770f6067ceeeab5ca23bd916dd426fbcae8ffff6c25bd691fac124942660474783a80838e
+EBUILD projectx-0.91.0.04.ebuild 3536 SHA256 3a88ec0012b3ed4679331a1077963a4505d963fec743d086097ef3f7f7b24c2f SHA512 f9419326d44a95844ba2428210a6fd6d529753c2954f10eba4115f65f10834627868afd46a1bd8ca9633e1e1dd19aa916d74e19422075a40f7ff8400f458fbe2 WHIRLPOOL 127efc0d471dff23bf655883fc71ca4d3c0497b35643d577bf83ed8a8511d9d9f3e8c49851f17124031b06f02e226ee8e4176dd6366e8b24434b1d42fe22785b
+MISC ChangeLog 7854 SHA256 e82315bd08cba97d0923890c26f64a87f8097fd8ba9226749e90b918e0dbdc63 SHA512 04e80f231145affa2a6426ca4498895fc72c334f7f169a209b23d6fdfafa92c4d277b5cc0e70fc1410e36e608b8ee604e219e8880d54b8cda80facec86092fb3 WHIRLPOOL efaadf1c9c7b927786825fec31411a6dbc339dadf6c9d6dfcf1cafedba90ba9b414565b9ab43b33120c39daae4ea7ee6b8c1f195c33b0d6667bede9258f6ec9d
 MISC metadata.xml 648 SHA256 02f9b720480dac25585b7c9e5f8c39caf0560bef841f75788215f2dbc28a3940 SHA512 f3e516bbfe4731929d74f2cd38aac6159007a5a3850e3f3b52f52b7b56dd896349e823cf0d2fb0d5f831fd24b311fb69e8e59a549f45d0f68ceec133a55a0955 WHIRLPOOL 1817bdecfdf4b994fcf7b9bd4cf7ef40187853cc8464b770047d30177e1cd5d590892d4f3b4e454ced7cffb97f1f8548b8c48337de8efaf989604b0bddea614d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBewroACgkQuUQtlDBCeQJdLwCbBesBC2o040+eS6nN+ZORh7aW
-AhAAnjIZuvOxdLmIw3D6LqfsjQ1R8Han
-=9W/a
+iEYEAREIAAYFAlBpxVAACgkQlcuUeyFa0U1ImQCgp63cjBE09PQy1+Go/9B5jzXn
+ypoAoL3g8YiMs/KSM+ngBRIcmucXhjav
+=KdD6
 -----END PGP SIGNATURE-----
diff --git a/media-video/projectx/projectx-0.91.0.04.ebuild b/media-video/projectx/projectx-0.91.0.04.ebuild
new file mode 100644
index 000000000000..782a7518da87
--- /dev/null
+++ b/media-video/projectx/projectx-0.91.0.04.ebuild
@@ -0,0 +1,136 @@
+# 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.04.ebuild,v 1.1 2012/10/01 16:31:11 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"
+	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
+	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
+	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
+}
+
+pkg_postinst() {
+	elog "Default config file and location has changed!"
+	elog
+	elog "It is now located at \$XDG_CONFIG_HOME/Project-X.ini"
+	elog "You should move your old X.ini into the new location."
+	elog
+	elog "Hint: \$XDG_CONFIG_HOME defaults to ~/.config"
+}