version bump

Package-Manager: portage-2.1.3.16

5 files changed, 142 insertions, 5 deletions

diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog
index 268789211144..dfce0cc49ea8 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.10 2007/11/23 21:08:46 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.11 2007/12/19 15:26:00 caleb Exp $
+
+*qtjambi-4.3.3_p1 (19 Dec 2007)
+
+  19 Dec 2007; Caleb Tennis <caleb@gentoo.org> +files/generator-4.3.3.patch,
+  +qtjambi-4.3.3_p1.ebuild:
+  version bump
 
   23 Nov 2007; Samuli Suominen <drac@gentoo.org> qtjambi-4.3.2_p1.ebuild:
   Keyword ~amd64 wrt #197763.
diff --git a/dev-java/qtjambi/Manifest b/dev-java/qtjambi/Manifest
index 04570dfd6061..226eea6cc541 100644
--- a/dev-java/qtjambi/Manifest
+++ b/dev-java/qtjambi/Manifest
@@ -6,6 +6,10 @@ AUX generator-4.3.2.patch 489 RMD160 a6b576b6198ca5623a55ee36c93cb6b913bc92ef SH
 MD5 ec247dfe6e6e0a73e135350ae1694801 files/generator-4.3.2.patch 489
 RMD160 a6b576b6198ca5623a55ee36c93cb6b913bc92ef files/generator-4.3.2.patch 489
 SHA256 e73eae66273c052ab19fb1b475c166d84533451788d2e248b88d6aa87e244ad9 files/generator-4.3.2.patch 489
+AUX generator-4.3.3.patch 489 RMD160 a6b576b6198ca5623a55ee36c93cb6b913bc92ef SHA1 abc82c760d76b2f9632f1a5734ecde59f066632a SHA256 e73eae66273c052ab19fb1b475c166d84533451788d2e248b88d6aa87e244ad9
+MD5 ec247dfe6e6e0a73e135350ae1694801 files/generator-4.3.3.patch 489
+RMD160 a6b576b6198ca5623a55ee36c93cb6b913bc92ef files/generator-4.3.3.patch 489
+SHA256 e73eae66273c052ab19fb1b475c166d84533451788d2e248b88d6aa87e244ad9 files/generator-4.3.3.patch 489
 AUX jambi.pri.diff 378 RMD160 21d23395801cd0c0818fd9dd1efb09e53f746877 SHA1 ecc1f8333a966a90b5023e84aa0f0b69aa74790c SHA256 67fdf9d6199906dfdd769b73e1ebf281109de892b3b1a377d70c7746249b3b46
 MD5 b88a57370de233e86a620cea3d2f237c files/jambi.pri.diff 378
 RMD160 21d23395801cd0c0818fd9dd1efb09e53f746877 files/jambi.pri.diff 378
@@ -24,6 +28,7 @@ RMD160 3843aac6fe19d84f7b5f92040e73592fa477b79d files/qtjambi_base.pri.diff 315
 SHA256 04a90f77b9045309b187078163ee752f9f04298fba79751f0f129789964a5566 files/qtjambi_base.pri.diff 315
 DIST qtjambi-gpl-src-4.3.1_01.tar.gz 3752087 RMD160 fd1e1a99b787f9cd0a92f3e45148be701980d53c SHA1 dbc497d7bdf787c649db04cf6f9a2041b1b959a0 SHA256 bef26d5d3b04e0eb6505bbd784854536c8b128306059945fe71359963bd6c844
 DIST qtjambi-gpl-src-4.3.2_01.tar.gz 3754208 RMD160 5b4dad0cd525596807d0d3c407bae0a3e6653952 SHA1 d08cfadccac0c7ab5b43d569e383fa45b45f1e54 SHA256 c500851ec0692ca2cfa6e45ef5c409f33101b7fe0c3351eeb8b81defc187bf37
+DIST qtjambi-gpl-src-4.3.3_01.tar.gz 3797578 RMD160 b94d3102035d8e6fa51188e4bcf5e4149ab2fbc8 SHA1 47240cbb7bc8998189a7a92aa15035cb1bd7545e SHA256 ada8f18f91b28079c7743fb3687571113a6682485855672340c8d82923348182
 EBUILD qtjambi-4.3.1_p1.ebuild 3250 RMD160 b1a24d3e4aa84e382786b797f5a145542401403d SHA1 968e4920922b240f913a22b6baa4f6d2eadf2777 SHA256 a61c9761cdac9882c97fcc33cc7e71c1c94fa38d7ecdc95b0fd85246cea50096
 MD5 1383873cd4e10f596976bc3bfa09daca qtjambi-4.3.1_p1.ebuild 3250
 RMD160 b1a24d3e4aa84e382786b797f5a145542401403d qtjambi-4.3.1_p1.ebuild 3250
@@ -32,10 +37,14 @@ EBUILD qtjambi-4.3.2_p1.ebuild 3282 RMD160 a472b418965ff7778805619241c3e72978a48
 MD5 95ea16e4b3d00a7f74e11a8d585464c6 qtjambi-4.3.2_p1.ebuild 3282
 RMD160 a472b418965ff7778805619241c3e72978a480c4 qtjambi-4.3.2_p1.ebuild 3282
 SHA256 c003ff63a41f62a8f50293afe8a492d3e425ff5b77092ac248b9a1278b93c6be qtjambi-4.3.2_p1.ebuild 3282
-MISC ChangeLog 1927 RMD160 495e1ba34b62fc72850b0ace93cef3670d71444b SHA1 97c08738f2fd5089b42dad54fe07f322c76f292c SHA256 a1c8c2c6b78d17b0a81daf7d008d1323b668c287285186895572f390bb71fb3a
-MD5 5c15098ef5bed8eec4f19c4683be5e14 ChangeLog 1927
-RMD160 495e1ba34b62fc72850b0ace93cef3670d71444b ChangeLog 1927
-SHA256 a1c8c2c6b78d17b0a81daf7d008d1323b668c287285186895572f390bb71fb3a ChangeLog 1927
+EBUILD qtjambi-4.3.3_p1.ebuild 3283 RMD160 24f37093cab1c88271a3826a4758ef5cc4554ccd SHA1 f8d965318614fc97b4f9f2dab678b1455f1a6962 SHA256 109288cacfa8abd03565aafbbafdbd43454ee9bd1f0c47d7b325bd01c8b13d04
+MD5 2d5e8e695752fef632f60f5d70153e91 qtjambi-4.3.3_p1.ebuild 3283
+RMD160 24f37093cab1c88271a3826a4758ef5cc4554ccd qtjambi-4.3.3_p1.ebuild 3283
+SHA256 109288cacfa8abd03565aafbbafdbd43454ee9bd1f0c47d7b325bd01c8b13d04 qtjambi-4.3.3_p1.ebuild 3283
+MISC ChangeLog 2082 RMD160 7137c6406216c86b6bc7629f80a8b821bec2f54d SHA1 70c4d1fbd24efa821a34415ce12d6d43dded36e4 SHA256 ccb80175074f13b80b5f933984fbd3645caa7a8a199422b1fa317dbcb4880025
+MD5 d7ae648ed894ce2cea713eb98327a220 ChangeLog 2082
+RMD160 7137c6406216c86b6bc7629f80a8b821bec2f54d ChangeLog 2082
+SHA256 ccb80175074f13b80b5f933984fbd3645caa7a8a199422b1fa317dbcb4880025 ChangeLog 2082
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
@@ -46,3 +55,6 @@ SHA256 2554db1fa59fe4c31be88ff0faf781d4b040758df8abb3c35e1f5ec544970a9a files/di
 MD5 acccd4abfd25136bbfbd519b0c879436 files/digest-qtjambi-4.3.2_p1 277
 RMD160 16ff5890408fbf9c61a2b84826eed7ead2d33bbb files/digest-qtjambi-4.3.2_p1 277
 SHA256 e1e9bfef8b212e40dbb240b648f938a2725f23e9bb2008592da4846ffdedc143 files/digest-qtjambi-4.3.2_p1 277
+MD5 5571c8381861b1cd0fd517e056afca24 files/digest-qtjambi-4.3.3_p1 277
+RMD160 d5aea0a67ba8015ec575b03b9a4d6445d38312fb files/digest-qtjambi-4.3.3_p1 277
+SHA256 49f13ccc311d4d5b66f8cd302b83bb13324e2019be8397707ecfaf257ea9e662 files/digest-qtjambi-4.3.3_p1 277
diff --git a/dev-java/qtjambi/files/digest-qtjambi-4.3.3_p1 b/dev-java/qtjambi/files/digest-qtjambi-4.3.3_p1
new file mode 100644
index 000000000000..679f1a3b0b86
--- /dev/null
+++ b/dev-java/qtjambi/files/digest-qtjambi-4.3.3_p1
@@ -0,0 +1,3 @@
+MD5 ef6a2afceaa706adf1127369c87263c1 qtjambi-gpl-src-4.3.3_01.tar.gz 3797578
+RMD160 b94d3102035d8e6fa51188e4bcf5e4149ab2fbc8 qtjambi-gpl-src-4.3.3_01.tar.gz 3797578
+SHA256 ada8f18f91b28079c7743fb3687571113a6682485855672340c8d82923348182 qtjambi-gpl-src-4.3.3_01.tar.gz 3797578
diff --git a/dev-java/qtjambi/files/generator-4.3.3.patch b/dev-java/qtjambi/files/generator-4.3.3.patch
new file mode 100644
index 000000000000..2557b0bc0e3d
--- /dev/null
+++ b/dev-java/qtjambi/files/generator-4.3.3.patch
@@ -0,0 +1,10 @@
+--- generator/main.h.orig	2007-10-23 08:03:37.000000000 -0400
++++ generator/main.h	2007-10-23 08:03:42.000000000 -0400
+@@ -74,7 +74,6 @@
+         if (qtdir.isEmpty()) {
+             qWarning("QTDIR environment variable not set. This may cause problems with finding the necessary include files.");
+         } else {
+-            qtdir += "/include";
+             includes << (qtdir + "/QtXml");
+             includes << (qtdir + "/QtNetwork");
+             includes << (qtdir + "/QtCore");
diff --git a/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild b/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild
new file mode 100644
index 000000000000..5bd960b4ad06
--- /dev/null
+++ b/dev-java/qtjambi/qtjambi-4.3.3_p1.ebuild
@@ -0,0 +1,106 @@
+# 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.3_p1.ebuild,v 1.1 2007/12/19 15:26:00 caleb Exp $
+
+inherit eutils java-pkg-2
+
+QTVERSION=4.3.3
+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="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="~x11-libs/qt-${QTVERSION}
+	>=virtual/jdk-1.5"
+
+RDEPEND="~x11-libs/qt-${QTVERSION}
+	>=virtual/jre-1.5"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/generator-4.3.3.patch
+	epatch ${FILESDIR}/qtjambi_base.pri.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
+}
+
+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/"
+}