Always create 'projectx_nogui' wrapper script and symlink 'projectx' corresponding to the 'X' use-flag either to 'projectx_gui' or 'projectx_nogui', solving bug #139883.

Package-Manager: portage-2.1.1_pre2-r6

5 files changed, 118 insertions, 10 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index da3b89313a20..ecadc4d533cb 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.17 2006/07/05 19:21:24 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.18 2006/07/10 19:42:53 sbriesen Exp $
+
+*projectx-0.90.4.00-r2 (10 Jul 2006)
+
+  10 Jul 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +projectx-0.90.4.00-r2.ebuild:
+  Always create 'projectx_nogui' wrapper script and symlink 'projectx'
+  corresponding to the 'X' use-flag either to 'projectx_gui' or
+  'projectx_nogui', solving bug #139883.
 
 *projectx-0.90.4.00-r1 (05 Jul 2006)
 
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 9655ca777ab2..e08c2d004888 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -7,8 +7,8 @@ MD5 eb72efa3ebfc180c4ecd9334b6e7fa00 files/build-0.90.4.xml 2256
 RMD160 9ec47bf02544542f35ee63ca939b95ce081ce315 files/build-0.90.4.xml 2256
 SHA256 ed4ca5545ee8ade4fd5cb2d8ce6000e40f05c1e6cbfeb03079d11f8942876849 files/build-0.90.4.xml 2256
 DIST ProjectX_LanguagePack_0.90.4.00.zip 124257 RMD160 09f63b0761568f5934960663e52a0043a48727ee SHA1 9887c7d9a81384e006efb6dd8ef2925add7def3f SHA256 eff00b1b623e8a0c986eb79472622fd771c1c44b9d9d83062e6cc0772e9fd841
-DIST ProjectX_Source_0.90.3.00.zip 903455
-DIST ProjectX_Source_0.90.3.01.zip 909054 RMD160 519eede3650da7a118df465aff1755b6b22e99b8 SHA256 6f48b46752c59be4291c9d09e8c9954a614cc85e9155d89bb3e1fb6f3935f0b8
+DIST ProjectX_Source_0.90.3.00.zip 903455 RMD160 c2e1379ec009e8a2032132d790e045b9f53e60dc SHA1 20573b1dcc8f9e725d0bb406abc4c08a9f73fb97 SHA256 0e1a9311f0702e815f7f2c47130b013ab521c552c96d2712d1aafd31c1c6d4a3
+DIST ProjectX_Source_0.90.3.01.zip 909054 RMD160 519eede3650da7a118df465aff1755b6b22e99b8 SHA1 b22db11ecde627591752e0ea0ab0758b63f080a9 SHA256 6f48b46752c59be4291c9d09e8c9954a614cc85e9155d89bb3e1fb6f3935f0b8
 DIST ProjectX_Source_eng_0.90.4.00.zip 825784 RMD160 8914557a5e04f02ba574a48711ecb6b24e651482 SHA1 ef7be92217c276204fff290add0a9080c77b7eec SHA256 fe41e409381a988201404338bb3dd178caa71ab6058151ae49a1e97b0aa58537
 EBUILD projectx-0.90.3.00.ebuild 1811 RMD160 da56ef8ba6c9d1ec283f70ead0064fb952628622 SHA1 de562f8abc863b119dcc20d7b6f379a4a2ebc52c SHA256 7bbd54d1ddf9d59e5f6432e4478f23f9a31b82aad25dd507ad381b505a3f8978
 MD5 245899bcc8a1be8b6fd24fe9c7f0fb81 projectx-0.90.3.00.ebuild 1811
@@ -22,21 +22,25 @@ EBUILD projectx-0.90.4.00-r1.ebuild 1897 RMD160 5d2d784afc6c5f10cf5d3770916c6e71
 MD5 b489965115d2b0be8a6f57ac9ebc310b projectx-0.90.4.00-r1.ebuild 1897
 RMD160 5d2d784afc6c5f10cf5d3770916c6e71edd90be2 projectx-0.90.4.00-r1.ebuild 1897
 SHA256 c6dc9b39759eac495460598f7c3a1b3f2cdf48c4fcaba9afc2c001eb5a65e9be projectx-0.90.4.00-r1.ebuild 1897
+EBUILD projectx-0.90.4.00-r2.ebuild 1974 RMD160 af07f99194c4421489794cc08a7363eebacac823 SHA1 3a0b95d7c394facebc51c7b0bd0685d4c1bebc0d SHA256 9e1690535c2109794258c6b44d1897aba0bc50d4155cd94513f2e8f8314e6952
+MD5 b3bedddafc52cd90afa9e06c5e1d3382 projectx-0.90.4.00-r2.ebuild 1974
+RMD160 af07f99194c4421489794cc08a7363eebacac823 projectx-0.90.4.00-r2.ebuild 1974
+SHA256 9e1690535c2109794258c6b44d1897aba0bc50d4155cd94513f2e8f8314e6952 projectx-0.90.4.00-r2.ebuild 1974
 EBUILD projectx-0.90.4.00.ebuild 2115 RMD160 12867dd9ebfc237ad231f9f5c23875c881c5d141 SHA1 5457a15c80b463e455e2e98f9e07f20c39a0d5d3 SHA256 80d0182bbe500d4ebcc9ef3cdf75f81749f207bbf2e5808f30ec339df2c46ef3
 MD5 eed5124969ca92b613e1936192cd1f4b projectx-0.90.4.00.ebuild 2115
 RMD160 12867dd9ebfc237ad231f9f5c23875c881c5d141 projectx-0.90.4.00.ebuild 2115
 SHA256 80d0182bbe500d4ebcc9ef3cdf75f81749f207bbf2e5808f30ec339df2c46ef3 projectx-0.90.4.00.ebuild 2115
-MISC ChangeLog 1010 RMD160 ed01481e41010d2d09ff889ee27fcaa80e5137e8 SHA1 28bf9efd32c37ee5bc81f4c0dfe0612d6412e46e SHA256 c9b79f992bbfd5ccdb145744b8c81f4c6c4fe0024fa70a68de39deb582f1ef58
-MD5 5caa2cdba95d90a3eb4377c3678bf3a7 ChangeLog 1010
-RMD160 ed01481e41010d2d09ff889ee27fcaa80e5137e8 ChangeLog 1010
-SHA256 c9b79f992bbfd5ccdb145744b8c81f4c6c4fe0024fa70a68de39deb582f1ef58 ChangeLog 1010
+MISC ChangeLog 1313 RMD160 d79f62b7c35bf63c30d31d4846b634c8c83c4931 SHA1 54818d98209c0a4f8b96a79346d169098aa2d637 SHA256 3efc8d0aafbce412c5999e7d84a63b29c21cf3a77a2b7d085a2bd38b45494b5d
+MD5 fbb08520ffe5803deb5f4139c5c15af9 ChangeLog 1313
+RMD160 d79f62b7c35bf63c30d31d4846b634c8c83c4931 ChangeLog 1313
+SHA256 3efc8d0aafbce412c5999e7d84a63b29c21cf3a77a2b7d085a2bd38b45494b5d ChangeLog 1313
 MISC metadata.xml 552 RMD160 e64d43298a7062ee3524be66149d4189e0a54138 SHA1 376eadcfc81a41cff52b15c0a2a90f530660171f SHA256 594f8951dcebe3c7e750e8ac9e2ae008f55c01d0d06b39865c9f682bb8bbfa8f
 MD5 a5bc554bd20390118527a75f399aca04 metadata.xml 552
 RMD160 e64d43298a7062ee3524be66149d4189e0a54138 metadata.xml 552
 SHA256 594f8951dcebe3c7e750e8ac9e2ae008f55c01d0d06b39865c9f682bb8bbfa8f metadata.xml 552
-MD5 94a4612fd016a57fa22cef5b5c9ca6d1 files/digest-projectx-0.90.3.00 74
-RMD160 84b68380a1843385a6f9280d525c3b4e831b9da2 files/digest-projectx-0.90.3.00 74
-SHA256 8356489ed14c6f205c8169d417d6f18314c65929c385bef97d919d48e237fe61 files/digest-projectx-0.90.3.00 74
+MD5 2ffb932cea3d81f421bf2f191f3958de files/digest-projectx-0.90.3.00 268
+RMD160 54a437f402c2028ba2041773fd2901f3977f9e2b files/digest-projectx-0.90.3.00 268
+SHA256 64ad6d8121b431954488d7ea70bd913e61e97cc03e0d9376d56f3f503dfa3d6d files/digest-projectx-0.90.3.00 268
 MD5 480ae2e47b381833b2c9b15c58872d84 files/digest-projectx-0.90.3.01 268
 RMD160 44ce96d0fecd94ccd7da298f811c1520b877dbea files/digest-projectx-0.90.3.01 268
 SHA256 711dc2208fb9c68ea445d25c4e74cdee8685e539204666d0ea18c0ff7f52bf2b files/digest-projectx-0.90.3.01 268
@@ -46,3 +50,6 @@ SHA256 0485d242e0b8e732f6c3c0a324b5cd42599809579f58ba18f8b45446e7203293 files/di
 MD5 7b4581f73e9f900c70c80e4fbde2eaf7 files/digest-projectx-0.90.4.00-r1 566
 RMD160 37de8f0abb23d7161191e5129bdf15949525fb02 files/digest-projectx-0.90.4.00-r1 566
 SHA256 0485d242e0b8e732f6c3c0a324b5cd42599809579f58ba18f8b45446e7203293 files/digest-projectx-0.90.4.00-r1 566
+MD5 7b4581f73e9f900c70c80e4fbde2eaf7 files/digest-projectx-0.90.4.00-r2 566
+RMD160 37de8f0abb23d7161191e5129bdf15949525fb02 files/digest-projectx-0.90.4.00-r2 566
+SHA256 0485d242e0b8e732f6c3c0a324b5cd42599809579f58ba18f8b45446e7203293 files/digest-projectx-0.90.4.00-r2 566
diff --git a/media-video/projectx/files/digest-projectx-0.90.3.00 b/media-video/projectx/files/digest-projectx-0.90.3.00
index 3b1249dc87a1..17f32b3014c8 100644
--- a/media-video/projectx/files/digest-projectx-0.90.3.00
+++ b/media-video/projectx/files/digest-projectx-0.90.3.00
@@ -1 +1,3 @@
 MD5 cce86010313339021d173ea5e1cf40b7 ProjectX_Source_0.90.3.00.zip 903455
+RMD160 c2e1379ec009e8a2032132d790e045b9f53e60dc ProjectX_Source_0.90.3.00.zip 903455
+SHA256 0e1a9311f0702e815f7f2c47130b013ab521c552c96d2712d1aafd31c1c6d4a3 ProjectX_Source_0.90.3.00.zip 903455
diff --git a/media-video/projectx/files/digest-projectx-0.90.4.00-r2 b/media-video/projectx/files/digest-projectx-0.90.4.00-r2
new file mode 100644
index 000000000000..a5702858cd7c
--- /dev/null
+++ b/media-video/projectx/files/digest-projectx-0.90.4.00-r2
@@ -0,0 +1,6 @@
+MD5 edfe8d04bd3d403eec4d9e27d1b976d2 ProjectX_LanguagePack_0.90.4.00.zip 124257
+RMD160 09f63b0761568f5934960663e52a0043a48727ee ProjectX_LanguagePack_0.90.4.00.zip 124257
+SHA256 eff00b1b623e8a0c986eb79472622fd771c1c44b9d9d83062e6cc0772e9fd841 ProjectX_LanguagePack_0.90.4.00.zip 124257
+MD5 92d7b5aea50b8811307f27b6e01ceb5c ProjectX_Source_eng_0.90.4.00.zip 825784
+RMD160 8914557a5e04f02ba574a48711ecb6b24e651482 ProjectX_Source_eng_0.90.4.00.zip 825784
+SHA256 fe41e409381a988201404338bb3dd178caa71ab6058151ae49a1e97b0aa58537 ProjectX_Source_eng_0.90.4.00.zip 825784
diff --git a/media-video/projectx/projectx-0.90.4.00-r2.ebuild b/media-video/projectx/projectx-0.90.4.00-r2.ebuild
new file mode 100644
index 000000000000..9394d23470f5
--- /dev/null
+++ b/media-video/projectx/projectx-0.90.4.00-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/07/10 19:42:53 sbriesen Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="ProjectX"
+
+# 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://sourceforge.net/projects/project-x/"
+SRC_URI="mirror://sourceforge/project-x/${MY_PN}_Source_eng_${PV}.zip
+	mirror://sourceforge/project-x/${MY_PN}_LanguagePack_${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="X doc source"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-net
+	=dev-java/jakarta-oro-2.0*"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	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"
+}
+
+ant_src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV%.*}.xml" build.xml
+
+	# patch location of executable
+	sed -i -e "s:^\(Exec=\).*:\1${PN}:g" *.desktop
+
+	# convert CRLF to LF
+	edos2unix *.txt MANIFEST.MF
+
+	# update library packages	
+	cd lib
+	rm -f {commons-net,jakarta-oro}*.jar
+	java-pkg_jar-from commons-net
+	java-pkg_jar-from jakarta-oro-2.0
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	eant jar $(use_doc docs) -Dmanifest.mainclass=$(mainclass)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	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_dohtml -r apidocs/
+	use source && java-pkg_dosrc src/.
+}