Version bump. Switch to EAPI 4.

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

3 files changed, 152 insertions, 6 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 1f875a037824..1becc0b56f27 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.49 2011/08/17 10:51:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.50 2011/08/18 18:54:42 billie Exp $
+
+*projectx-0.91.0.02 (18 Aug 2011)
+
+  18 Aug 2011; Daniel Pielmeier <billie@gentoo.org> +projectx-0.91.0.02.ebuild:
+  Version bump. Switch to EAPI 4.
 
   17 Aug 2011; Thomas Kahle <tomka@gentoo.org>
   projectx-0.90.4.00_p33-r1.ebuild:
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index bfb9dfb95995..3a78bcf0e365 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -8,18 +8,20 @@ AUX projectx-0.90.4.00_p33-stdout-corrupt.patch 358 RMD160 66a6dc7d4fce7b4e5688f
 AUX projectx-0.90.4.00_p33-xdg.patch 1062 RMD160 3ac68e2c429e3dfec09a0883e8e60ec6f904fef1 SHA1 83b408fdce85fd07e26eb1b8f1d19f8fccd68857 SHA256 3cfe281805420ec64cec6b571c7db7a5e1f672b806bb9283f653b3a04c874f00
 DIST projectx-0.90.4.00_p33.tar.bz2 860737 RMD160 fac8d58717ce764fac226ee1ee651aa26cf56543 SHA1 5e7fb3bfbe3f23cb7af83cf3cb460261e3e159e9 SHA256 c667411baebe80dcfabc4fb35d6517d98e4394389cb254a7550a16fd8d73fa1c
 DIST projectx-0.90.4.00_p33.tar.xz 769280 RMD160 12eec848fea91c706f106d32db6e78eb1fd965de SHA1 ade1b1c1ead3c0c273067c0e356e107091c3bdd3 SHA256 d8c6ec60a8fb057d5e5892fb6484fc3845df4e8ae533ec0588b4fc1705667a53
+DIST projectx-0.91.0.02.tar.xz 773968 RMD160 6caf23db6ff31e7238ae77483875383e3e294d88 SHA1 acadf8a342331f141106bbd82ca5979deaa2f2ef SHA256 01b990cb5509fd426d961b0a51f736505c963472c1c9c316e168fd3fe5eda8de
 DIST projectx-icon.png 1692 RMD160 8637c2f43b474a9327244d4a42d3164f2591c36a SHA1 3ce7c91e2f7dd09ee7c2bff9adb22cf912a6bb74 SHA256 0736e4320fbdb211a69e839b768175f18b0b2ef91636a9b382b4024a095dd4cf
 DIST projectx-idctfast.tar.xz 12444 RMD160 3e3887ad8afc458dfe4bb516843b92107b80a063 SHA1 4d0975e6c8672b9fb6f2a464246466beea824111 SHA256 d05b86b05c4924b434a6a9bb443c05d5421f6df7a2b19616a53ef1e4b4dada45
 DIST projectx-portable.tar.bz2 14343 RMD160 bd108542011f0245903bf3521441cfa35bd9684f SHA1 c4dd3233da84c04016300ed187b8dbaa07d72a5f SHA256 b51aa772a623904fa855ba28cd202bea7535578cb4e3466a3972f619f5253605
 DIST xdg-20100731.java.xz 648 RMD160 937ce2b225e682662e9cea44b0554d83d5372cb2 SHA1 9493062969d21c06c710b71146dc530b35f23c7b SHA256 b6a189323fcc25ae5bebc006d870b4191a3bec34c80de7e337e5ed8a39f332c6
 EBUILD projectx-0.90.4.00_p33-r1.ebuild 3595 RMD160 d06c84a663a7fb073cac3bf92bbdb9653600422c SHA1 d63574dea2fca7c850f07a1319ddcc3fdd5b88ec SHA256 8cae239ec5f2177fd629cfde86512a00dba943852d8c25f4a2ac64d8a8299a71
 EBUILD projectx-0.90.4.00_p33.ebuild 2878 RMD160 2f07a1852ee979322b77c95529cacdcfad4c85a5 SHA1 f83e076f4baaf0920d6d277c9ba070b0b19c91bf SHA256 26361eca0657c6bff25253602388718333547cd714f1f7e203ef6477936234c5
-MISC ChangeLog 6410 RMD160 f6ca4714739798b4810c79c561cc7b0fa621e0e6 SHA1 b4cf3340b68fa7ca0cb5e1521fca414b5f8531df SHA256 969a2fab2bca592a6127f76224a7f66a6f60b38c86d3fe1ba7f0a19ab271a4e4
+EBUILD projectx-0.91.0.02.ebuild 3619 RMD160 7c4499b4ded18f0b6028df3e53433cb46d9a7461 SHA1 18cf7c2e59a8ca5ed02f9cddba3bd81767d04e82 SHA256 dbb935506880f47b386676f6b5688905d7748f770dd272c1a7d1352945f2c2b5
+MISC ChangeLog 6561 RMD160 68c33a9254fdc6246e0b26a0514d5b473d26dec8 SHA1 223280a469ac1a0b8dd50eb6de529a8065e01947 SHA256 f61be30e75db8ebd3dc2f77ed0f0d908c3edeae2eaafdda39a407c6ab9a0aea3
 MISC metadata.xml 648 RMD160 08c95d7596fa4b9c15412d618a8776a2c4a4b4d5 SHA1 08509daf9306b49f7753133791b3618724f76e1a SHA256 02f9b720480dac25585b7c9e5f8c39caf0560bef841f75788215f2dbc28a3940
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5LnSAACgkQodBTJSDyo67QgwD/TmJDD9CumuJrvmX+HRwvr+vE
-Fky1cnXLTh2nPSyr5f0A/1IaqZGqkrxOSaRuCe1k7uPiwYqvBegSP+in4HGlgUCz
-=U6Cs
+iEYEAREIAAYFAk5NYAwACgkQlcuUeyFa0U1mVQCffJbhZ1tg7nvFGjVLoUHYZpIF
+AOEAoKDMphXHObd8eJNCVdvAVwmAZ8yd
+=aSM8
 -----END PGP SIGNATURE-----
diff --git a/media-video/projectx/projectx-0.91.0.02.ebuild b/media-video/projectx/projectx-0.91.0.02.ebuild
new file mode 100644
index 000000000000..c831e983a723
--- /dev/null
+++ b/media-video/projectx/projectx-0.91.0.02.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2011 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.02.ebuild,v 1.1 2011/08/18 18:54:42 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"
+
+	# compatibility symlink, should be removed
+	dosym ${PN}_cli /usr/bin/${PN}_nogui
+
+	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"
+}