Add a new snapshot. Add myself to maintainers.

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

4 files changed, 149 insertions, 4 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 672a37a80df0..c58034d24ab2 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/projectx
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.32 2008/12/06 22:46:22 sbriesen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.33 2009/10/08 18:29:21 billie Exp $
+
+*projectx-0.90.4.00_p32 (08 Oct 2009)
+
+  08 Oct 2009; Pielmeier Daniel <billie@gentoo.org>
+  +projectx-0.90.4.00_p32.ebuild, metadata.xml:
+  Add a new snapshot. Add myself to maintainers.
 
 *projectx-0.90.4.00_p26 (06 Dec 2008)
 
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 0dc5a17e6024..3fad73a862b7 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -4,12 +4,15 @@ DIST ProjectX_LanguagePack_0.90.4.00.zip 124257 RMD160 09f63b0761568f5934960663e
 DIST ProjectX_Source_0.90.4-portable.tbz2 14310 RMD160 444b6823e2f93513795d8fb745832074251ccb1b SHA1 11f5bf0601e74fd45ce859b9a92dc51594a57548 SHA256 f76cd471f3fdbb03203027dcdc3967bdb395aa36304b68106c45e2bb0a1cc416
 DIST ProjectX_Source_0.90.4-portable.zip 47775 RMD160 206deb5abb2e05a12ffe45994604fe4e6a4d80eb SHA1 e0d591677357d593d320ae281737eb9927c50e3b SHA256 e655315ba55ea9fdce96eff177eac9fd62453959a7a0259714aaca267e640434
 DIST ProjectX_Source_0.90.4.00_p26.tbz2 810539 RMD160 142dfb3ae7237b965df1117d9446edf7289fcc02 SHA1 dad535cc1f4130d368f1cae5820fd6fbdba812cd SHA256 f58abf74c43883e45937448a7a8d74f4d3b2f0a8ca921134cc0b940ba72d2d32
+DIST ProjectX_Source_0.90.4.00_p32.tbz2 855055 RMD160 699c8af6b11458adc93db3d67a5d1b7fc55752a4 SHA1 514742eb9c8c129f6e39d612022e155b422ffc0f SHA256 6d85428fe1e67eb4f0387f3e429f853a56ae01a7c7f2876b0bd825fc09478f8f
 DIST ProjectX_Source_eng_0.90.4.00.zip 825784 RMD160 8914557a5e04f02ba574a48711ecb6b24e651482 SHA1 ef7be92217c276204fff290add0a9080c77b7eec SHA256 fe41e409381a988201404338bb3dd178caa71ab6058151ae49a1e97b0aa58537
 DIST projectx-patches-0.90.4.00-r3.tbz2 1394 RMD160 05e2c2936bcbbcb3344ca22ae0379e9e1d33a37c SHA1 e73aa3bc14e8015029ceeacbc2928b551b9354aa SHA256 57cb89ac50fc6418ae30cc68a4003fc3cc2c0eace8c7f9e108a863a1424fcde6
 DIST projectx-patches-0.90.4.00-r4.tbz2 1394 RMD160 05e2c2936bcbbcb3344ca22ae0379e9e1d33a37c SHA1 e73aa3bc14e8015029ceeacbc2928b551b9354aa SHA256 57cb89ac50fc6418ae30cc68a4003fc3cc2c0eace8c7f9e108a863a1424fcde6
 DIST projectx-patches-0.90.4.00_p26.tbz2 1020 RMD160 0b6405e1b3191b855422ca1b047197593233d2c6 SHA1 cc4c1f157f9687295d0e3aa6dee0632ac2aea81c SHA256 5c9564f824cc4cbc56dd0bc6a5f75112e5833cefd45e89974cfa7f97bde23000
+DIST projectx-patches-0.90.4.00_p32.tbz2 1020 RMD160 0b6405e1b3191b855422ca1b047197593233d2c6 SHA1 cc4c1f157f9687295d0e3aa6dee0632ac2aea81c SHA256 5c9564f824cc4cbc56dd0bc6a5f75112e5833cefd45e89974cfa7f97bde23000
 EBUILD projectx-0.90.4.00-r3.ebuild 3056 RMD160 7015a2c20c4eb33d9fbb073e37ee8bae16980fc0 SHA1 6bd3199481623c6b2681373e9c80d04a31ef052e SHA256 3972757a08c08226cd5967f03cd74abc11118dacd801fb03e905b81569a47077
 EBUILD projectx-0.90.4.00-r4.ebuild 3107 RMD160 b002678fc6a034701e56a390f332c20e6ce247a7 SHA1 fe9f44f44db7ffb9539f36ae704329a27a19bc6a SHA256 d9abf89f5221ed1991b7775fa0fd419be84342c9243b2b316ea39fdaedc75088
 EBUILD projectx-0.90.4.00_p26.ebuild 3613 RMD160 1e3b20bee182c0f27a169c2554aa22196281b77c SHA1 05870cc5b7d6f7c267f472236b039856f400a8a2 SHA256 c6650f66e7530bdbbe41dbab837e3b335f4f880e7619a4c4bd5158687b0184a7
-MISC ChangeLog 3581 RMD160 1f60cd77b287fb4b198d770a1c38fe0c12664d80 SHA1 975136fd98459ff85e347fcf26a514865baf7098 SHA256 e43bab0c9daedc7c6e0a73b96b3bdff79cc602c5489fb70561b0506864396432
-MISC metadata.xml 552 RMD160 e64d43298a7062ee3524be66149d4189e0a54138 SHA1 376eadcfc81a41cff52b15c0a2a90f530660171f SHA256 594f8951dcebe3c7e750e8ac9e2ae008f55c01d0d06b39865c9f682bb8bbfa8f
+EBUILD projectx-0.90.4.00_p32.ebuild 3483 RMD160 78302d339fb56966bebaadf038241605815696e5 SHA1 cacf7439da135fc1e1e6411c029b8ec56cfc2dd3 SHA256 ed34d7cd18f4a3e7daccc55f636e3b28d9992a4ed14e46db72e256d9fec4affb
+MISC ChangeLog 3768 RMD160 9e616b4bda769340270be22f335ab8bb6d992be9 SHA1 5659534a3f971e2aa18527fd60118c5231129610 SHA256 dc48f327327e73259d3526736543e046c901151b25ef4cd7699222fb93f31f54
+MISC metadata.xml 648 RMD160 08c95d7596fa4b9c15412d618a8776a2c4a4b4d5 SHA1 08509daf9306b49f7753133791b3618724f76e1a SHA256 02f9b720480dac25585b7c9e5f8c39caf0560bef841f75788215f2dbc28a3940
diff --git a/media-video/projectx/metadata.xml b/media-video/projectx/metadata.xml
index 0b6d4977d4f0..af83f809f256 100644
--- a/media-video/projectx/metadata.xml
+++ b/media-video/projectx/metadata.xml
@@ -6,6 +6,10 @@
 		<email>sbriesen@gentoo.org</email>
 		<name>Stefan Briesenick</name>
 	</maintainer>
+	<maintainer>
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
 	<longdescription lang="en">
 		European digital radio &amp; television uses the DVB standard to broadcast
 		its data. Project X gives you a look behind the transmissions and tries
diff --git a/media-video/projectx/projectx-0.90.4.00_p32.ebuild b/media-video/projectx/projectx-0.90.4.00_p32.ebuild
new file mode 100644
index 000000000000..6cab1553924b
--- /dev/null
+++ b/media-video/projectx/projectx-0.90.4.00_p32.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00_p32.ebuild,v 1.1 2009/10/08 18:29:21 billie Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs java-pkg-2 java-ant-2
+
+MY_PN="ProjectX"
+MY_P="${MY_PN}_Source_${PV%.*}"
+
+# micro-release == 0 ?
+#if [ 0${PV##*.} -eq 0 ]; then
+#	MY_P="${MY_PN}_Source_${PV%.*}"
+#else
+#	MY_P="${MY_PN}_Source_${PV}"
+#fi
+
+DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
+HOMEPAGE="http://project-x.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MY_PN}_Source_${PV}.tbz2
+	mirror://gentoo/${PN}-patches-${PV}.tbz2
+	mirror://gentoo/${MY_P}-portable.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X doc source mmx java5 java6"
+
+COMMON_DEP="dev-java/commons-net
+	X? ( =dev-java/browserlauncher2-1* )"
+
+RDEPEND="java6? ( >=virtual/jre-1.6 )
+	!java6? ( java5? ( >=virtual/jre-1.5 ) )
+	!java6? ( !java5? ( >=virtual/jre-1.4 ) )
+	${COMMON_DEP}"
+
+DEPEND="java6? ( >=virtual/jdk-1.6 )
+	!java6? ( java5? ( >=virtual/jdk-1.5 ) )
+	!java6? ( !java5? ( >=virtual/jdk-1.4 ) )
+	${COMMON_DEP}
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF"
+}
+
+src_prepare() {
+	# copy build.xml
+	if use java6; then
+		sed 's:\(value=\"\)1\.4\(\"\):\11.6\2:g' \
+			"${FILESDIR}/build-${PV%.*}.xml" > build.xml
+	elif use java5; then
+		sed 's:\(value=\"\)1\.4\(\"\):\11.5\2:g' \
+			"${FILESDIR}/build-${PV%.*}.xml" > build.xml
+	else
+		cp -f "${FILESDIR}/build-${PV%.*}.xml" build.xml
+	fi
+
+	# patch location of executable
+	sed -i -e "s:^\(Exec=\).*:\1${PN}:g" *.desktop
+
+	# 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}" || rm -f "${X}~"
+		done
+	fi
+
+	# apply stdout corruption patch (zzam@gentoo.org)
+	epatch "${WORKDIR}/${PN}-stdout-corrupt.diff"
+
+	# apply BrowserLauncher2 patch
+	use X && epatch "${WORKDIR}/${PN}-bl2.diff"
+	rm -rf src/edu
+
+	# apply idctfast patchset
+	sed -i -e "s:IDCTRefNative:IDCTFast:g" src/net/sourceforge/dvb/projectx/video/MpvDecoder.java
+	sed -i -e "s:gcc:\$(CC):g" -e "s: -O2::g" lib/PORTABLE/Makefile
+
+	# merge/remove resources depending on USE="X"
+	if use X; then
+		mv -f htmls resources/
+	else
+		rm -rf src/net/sourceforge/dvb/projectx/gui
+		rm resources/*.gif
+	fi
+
+	# update library packages
+	cd lib
+	rm -f {commons-net,jakarta-oro}*.jar
+	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
+	use x86 && use mmx && IDCT="idct-mjpeg-mmx"
+
+	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
+
+	cd lib/PORTABLE
+	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC" || die "emake failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_doso lib/PORTABLE/libidctfast.so
+
+	java-pkg_dolauncher ${PN}_nogui --main $(mainclass) \
+		--java_args "-Djava.awt.headless=true"
+
+	if use X; then
+		java-pkg_dolauncher ${PN}_gui --main $(mainclass)
+		dosym ${PN}_gui /usr/bin/${PN}
+		domenu *.desktop
+	else
+		dosym ${PN}_nogui /usr/bin/${PN}
+	fi
+
+	dodoc *.txt
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}