Committing some ebuild fixes submitted by martin capitano.

Package-Manager: portage-2.1.2.7

5 files changed, 139 insertions, 11 deletions

diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog
index 7fd45c8a05cf..125a10d6188b 100644
--- a/dev-java/qtjambi/ChangeLog
+++ b/dev-java/qtjambi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/qtjambi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.3 2007/06/08 17:47:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.4 2007/06/18 12:01:21 caleb Exp $
+
+*qtjambi-4.3.0_p1-r2 (18 Jun 2007)
+
+  18 Jun 2007; Caleb Tennis <caleb@gentoo.org> qtjambi-4.3.0_p1-r1.ebuild,
+  +qtjambi-4.3.0_p1-r2.ebuild:
+  Committing some ebuild fixes submitted by martin capitano.
 
   08 Jun 2007; Caleb Tennis <caleb@gentoo.org> qtjambi-4.3.0_p1-r1.ebuild:
   Some more fixes to put stuff in the right locations
diff --git a/dev-java/qtjambi/Manifest b/dev-java/qtjambi/Manifest
index a606300b7174..b670702c4054 100644
--- a/dev-java/qtjambi/Manifest
+++ b/dev-java/qtjambi/Manifest
@@ -31,18 +31,22 @@ MD5 df02cb01b4ec84657cda5b0845e21b94 files/shared_global_p.h 1848
 RMD160 38ba966bb930d2ca65e1049e7580530f79e4dc97 files/shared_global_p.h 1848
 SHA256 bdbb728b1633dad6ead39c62d11c432395d4435434ced6558796f4f61fd2518d files/shared_global_p.h 1848
 DIST qtjambi-gpl-src-4.3.0_01.tar.gz 3371479 RMD160 bf9b0ed24abcb831228f4c8de4c7fffdb843255e SHA1 3c567e98734dda169c36739d9674e16a120683bc SHA256 dcbf214c96a39871868e43bef04b552f563359df400d4b05576b60ccb03e7dc3
-EBUILD qtjambi-4.3.0_p1-r1.ebuild 2507 RMD160 6e2fce905782bd28d278f93e10c1f23fd6464d0d SHA1 2a25d22bd4a6b44ce6f9c853e2afdd1efa0e52c0 SHA256 31ac97b3827196c8fba489e022afdbe42952426165c37c202d802d4fe0c4b392
-MD5 3aed195e9c2197080559ac2c3de9505a qtjambi-4.3.0_p1-r1.ebuild 2507
-RMD160 6e2fce905782bd28d278f93e10c1f23fd6464d0d qtjambi-4.3.0_p1-r1.ebuild 2507
-SHA256 31ac97b3827196c8fba489e022afdbe42952426165c37c202d802d4fe0c4b392 qtjambi-4.3.0_p1-r1.ebuild 2507
+EBUILD qtjambi-4.3.0_p1-r1.ebuild 2500 RMD160 3146cb1ebc849002bf15c695f0c302ad43add624 SHA1 ee259b2926d54805ade692b5d224a2c4e46739a3 SHA256 d5394576502ee5a76cf95749728023ead83dfd8c56033e3a2b0bd779d1f907ac
+MD5 16660dd25ea3218a9446aa7ba43b397c qtjambi-4.3.0_p1-r1.ebuild 2500
+RMD160 3146cb1ebc849002bf15c695f0c302ad43add624 qtjambi-4.3.0_p1-r1.ebuild 2500
+SHA256 d5394576502ee5a76cf95749728023ead83dfd8c56033e3a2b0bd779d1f907ac qtjambi-4.3.0_p1-r1.ebuild 2500
+EBUILD qtjambi-4.3.0_p1-r2.ebuild 3535 RMD160 e352ec8bfa18d94e1f2548a43e11b173b59af5c7 SHA1 88716920414f4e39b1ccf0e9359d5574a8b88e33 SHA256 4c7239c7ad35cfbbb4abc67598e32ebeda1ed82cc78d9c164d9b0f7794a349ec
+MD5 4237a7752c1851487b9c5fdae805eeac qtjambi-4.3.0_p1-r2.ebuild 3535
+RMD160 e352ec8bfa18d94e1f2548a43e11b173b59af5c7 qtjambi-4.3.0_p1-r2.ebuild 3535
+SHA256 4c7239c7ad35cfbbb4abc67598e32ebeda1ed82cc78d9c164d9b0f7794a349ec qtjambi-4.3.0_p1-r2.ebuild 3535
 EBUILD qtjambi-4.3.0_p1.ebuild 2434 RMD160 77359e62d4b362f08a765dc66de9a76b3ec9ca3a SHA1 ef1d94f8eb70029da7d0caf98b7ad97d77329fc0 SHA256 be9fae0de053787ce58c6277d2ca307067cd8368d2f8456a5c794da11913b2ec
 MD5 f1a6ae6645b2f9188c700772f7027fa7 qtjambi-4.3.0_p1.ebuild 2434
 RMD160 77359e62d4b362f08a765dc66de9a76b3ec9ca3a qtjambi-4.3.0_p1.ebuild 2434
 SHA256 be9fae0de053787ce58c6277d2ca307067cd8368d2f8456a5c794da11913b2ec qtjambi-4.3.0_p1.ebuild 2434
-MISC ChangeLog 874 RMD160 da20b6b25c63d4d97c317948bb5b09777caa38db SHA1 55168ca0bd1bbba02a969f215948a20f0f0c8040 SHA256 3413f1cd1dcc558f05874e3550583753896a300760a0ba432ee69dc0a50a3e2f
-MD5 07b1e7cdc9e241e5e7645777fef69fd0 ChangeLog 874
-RMD160 da20b6b25c63d4d97c317948bb5b09777caa38db ChangeLog 874
-SHA256 3413f1cd1dcc558f05874e3550583753896a300760a0ba432ee69dc0a50a3e2f ChangeLog 874
+MISC ChangeLog 1078 RMD160 f67218f1a797bd10871b8ac20eb0131da99d2f40 SHA1 b15a58bf5cc36fb02b1bf865fe6ddeb551f7ed10 SHA256 30ba6f5b661aed59c4358fddab066676c9e6ba7ebc6ef5494e22815c2547fbeb
+MD5 afb227b1ca3081816975c887a0bc3fcb ChangeLog 1078
+RMD160 f67218f1a797bd10871b8ac20eb0131da99d2f40 ChangeLog 1078
+SHA256 30ba6f5b661aed59c4358fddab066676c9e6ba7ebc6ef5494e22815c2547fbeb ChangeLog 1078
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -53,3 +57,6 @@ SHA256 d196bb56d25f637ad7fe36ce905ac68b7c6970dfa576741a5c82ccb8a3d03941 files/di
 MD5 cd2e1c67282c8e16f0500760edb6ecb5 files/digest-qtjambi-4.3.0_p1-r1 277
 RMD160 ee6e1f73e8412c6c1e099d46531d81032dd28c30 files/digest-qtjambi-4.3.0_p1-r1 277
 SHA256 d196bb56d25f637ad7fe36ce905ac68b7c6970dfa576741a5c82ccb8a3d03941 files/digest-qtjambi-4.3.0_p1-r1 277
+MD5 cd2e1c67282c8e16f0500760edb6ecb5 files/digest-qtjambi-4.3.0_p1-r2 277
+RMD160 ee6e1f73e8412c6c1e099d46531d81032dd28c30 files/digest-qtjambi-4.3.0_p1-r2 277
+SHA256 d196bb56d25f637ad7fe36ce905ac68b7c6970dfa576741a5c82ccb8a3d03941 files/digest-qtjambi-4.3.0_p1-r2 277
diff --git a/dev-java/qtjambi/files/digest-qtjambi-4.3.0_p1-r2 b/dev-java/qtjambi/files/digest-qtjambi-4.3.0_p1-r2
new file mode 100644
index 000000000000..6811b8d10351
--- /dev/null
+++ b/dev-java/qtjambi/files/digest-qtjambi-4.3.0_p1-r2
@@ -0,0 +1,3 @@
+MD5 513d69812c65bbcc8009e4d4825548d9 qtjambi-gpl-src-4.3.0_01.tar.gz 3371479
+RMD160 bf9b0ed24abcb831228f4c8de4c7fffdb843255e qtjambi-gpl-src-4.3.0_01.tar.gz 3371479
+SHA256 dcbf214c96a39871868e43bef04b552f563359df400d4b05576b60ccb03e7dc3 qtjambi-gpl-src-4.3.0_01.tar.gz 3371479
diff --git a/dev-java/qtjambi/qtjambi-4.3.0_p1-r1.ebuild b/dev-java/qtjambi/qtjambi-4.3.0_p1-r1.ebuild
index a114e58033ab..47a84269887b 100644
--- a/dev-java/qtjambi/qtjambi-4.3.0_p1-r1.ebuild
+++ b/dev-java/qtjambi/qtjambi-4.3.0_p1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.0_p1-r1.ebuild,v 1.5 2007/06/08 20:13:19 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.0_p1-r1.ebuild,v 1.6 2007/06/18 12:01:21 caleb Exp $
 
 inherit eutils java-pkg-2
 
@@ -80,7 +80,7 @@ src_compile() {
 
 src_install() {
 	# Install built jar
-        java-pkg_dojar qtjambi.jar
+	java-pkg_dojar qtjambi.jar
 
 	# Install designer plugins
 	insinto /usr/$(get_libdir)/qt4/plugins/designer
diff --git a/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild b/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild
new file mode 100644
index 000000000000..da2b31366756
--- /dev/null
+++ b/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild,v 1.1 2007/06/18 12:01:21 caleb Exp $
+
+inherit eutils java-pkg-2
+
+QTVERSION=4.3.0
+PATCHRELEASE=01
+
+DESCRIPTION="QtJambi is a set of Java bindings and utilities for the Qt C++ toolkit."
+HOMEPAGE="http://www.trolltech.com/"
+
+MY_PV=${QTVERSION}_${PATCHRELEASE}
+
+SRC_URI="ftp://ftp.trolltech.com/pub/qtjambi/source/qtjambi-gpl-src-${MY_PV}.tar.gz"
+S=${WORKDIR}/qtjambi-gpl-src-${MY_PV}
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~x86"
+
+IUSE=""
+
+DEPEND="~x11-libs/qt-4.3.0
+	>=virtual/jdk-1.5"
+
+RDEPEND="~x11-libs/qt-4.3.0
+	>=virtual/jre-1.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/generator.patch
+	epatch ${FILESDIR}/qtjambi_base.pri.diff
+	epatch ${FILESDIR}/jambipropertysheet.diff
+	epatch ${FILESDIR}/jambi.pri.diff
+
+	# If Qt wasn't built with accessibility use flag, then we needto remove some files from
+	# the list.
+	if ! built_with_use =x11-libs/qt-4* accessibility; then
+		epatch ${FILESDIR}/java_files_remove_accessibility.diff
+	fi
+	if ! built_with_use =x11-libs/qt-4* ssl; then
+		epatch ${FILESDIR}/java_files_remove_ssl.diff
+	fi
+
+	# These are two private headers from QtDesigner that aren't installed in the normal 
+	# Qt distribution, but are needed when building QtJambi
+	cp ${FILESDIR}/qdesigner_utils_p.h ${S}/qtjambi_designer
+	cp ${FILESDIR}/shared_global_p.h ${S}/qtjambi_designer
+}
+
+src_compile() {
+
+	# Step 1, build the source generator
+	einfo "Building the source generator"
+	cd ${S}/generator
+	/usr/bin/qmake && make || die "Error building generator"
+
+	# Step 2, run the generator
+	einfo "Running the generator.  This may take a few minutes."
+	QTDIR=/usr/include/qt4 ./generator
+
+	# Step 3, build the generated sources
+	export JAVADIR=$JDK_HOME
+	einfo "Building the generated sources."
+	cd ${S} && /usr/bin/qmake && make || die "Error building generated sources"
+
+	# Step 4, generate Ui_.java files
+	einfo "Running juic"
+	cd ${S} && ./bin/juic -cp .
+
+	# Step 5, compiling java files
+	einfo "Compiling java files"
+	mkdir -p ${S}/class
+	cd ${S} && ejavac -d class @java_files
+
+	# Step 6, build the jar file
+	cd ${S}/class && jar cf ../qtjambi.jar com/trolltech/qt com/trolltech/tools
+	# copy built classes for demos and examples
+	cd ${S}/class && cp -r com/trolltech/demos com/trolltech/examples com/trolltech/launcher ../com/trolltech
+	cd ${S} && jar cf qtjambi-src.jar com
+
+	# generate start scripts
+	jcp="/usr/share/qtjambi-4/lib"
+	cd ${S} && echo "#!/bin/sh" > bin/jambi-designer
+	cd ${S} && echo "LD_LIBRARY_PATH=/usr/lib/qt4 CLASSPATH=${jcp}/qtjambi.jar:${jcp}/qtjambi-src.jar:$CLASSPATH /usr/bin/designer" >> bin/jambi-designer
+
+	cd ${S} && echo "#!/bin/sh" > bin/jambi
+	cd ${S} && echo "LD_LIBRARY_PATH=/usr/lib/qt4 java -cp ${jcp}/qtjambi.jar:${jcp}/qtjambi-src.jar com.trolltech.launcher.Launcher" >> bin/jambi
+}
+
+src_install() {
+	# Install built jar
+	java-pkg_dojar qtjambi.jar
+	java-pkg_dojar qtjambi-src.jar
+
+	# Install designer plugins
+	insinto /usr/$(get_libdir)/qt4/plugins/designer
+	insopts -m0755
+	doins plugins/designer/*.so
+
+	cp -dpPR ${S}/lib/* ${D}/usr/$(get_libdir)/qt4
+
+	# Install binaries
+	dobin bin/*
+
+	einfo "eclipse - Project->Properties->Java Build Path->Libraries:"
+	einfo "library:                        /usr/share/qtjambi-4/lib/qtjambi.jar"
+	einfo "source (& demos):                /usr/share/qtjambi-4/lib/qtjambi-src.jar"
+	einfo "native library location:        /usr/$(get_libdir)/qt4/"
+}