Version bump ( bug #282365 )

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 182 insertions, 2 deletions

diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog
index 1e1f4712e68a..cd48cb1c402d 100644
--- a/dev-java/qtjambi/ChangeLog
+++ b/dev-java/qtjambi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/qtjambi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.21 2009/11/09 10:47:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.22 2009/12/18 16:07:51 hwoarang Exp $
+
+*qtjambi-4.5.2_p1 (18 Dec 2009)
+
+  18 Dec 2009; Markos Chandras <hwoarang@gentoo.org>
+  +qtjambi-4.5.2_p1.ebuild:
+  Version bump ( bug #282365 )
 
   09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
   -files/generator-4.3.3.patch, -files/jambi.pri.diff,
diff --git a/dev-java/qtjambi/Manifest b/dev-java/qtjambi/Manifest
index 8b9d9b810d88..ed63e0e1c412 100644
--- a/dev-java/qtjambi/Manifest
+++ b/dev-java/qtjambi/Manifest
@@ -5,7 +5,9 @@ AUX generator-4.4.3.patch 435 RMD160 e04e68ec33a0984811a5038d1bf039739d27e7a0 SH
 AUX generator-4.5.0_p1.patch 1352 RMD160 cdec9732e2a7d5421451b8e7e3e60de1c195fdee SHA1 9bfdca02dc220508ebe7255f8aff9780c99ed824 SHA256 80adfa473b386bcec10b861ba76759b3554167e3a81108b5e8d2d5ffc04d1e57
 DIST qtjambi-src-gpl-4.4.3_01.tar.gz 4909835 RMD160 2d5b014e5fa3e012d84b2b2557b3332135ff11d1 SHA1 58c5b90eb16c82ff80626ee30d0fe0405cca6e71 SHA256 4a938ab1fb75a119ad61fa6d5a5bee813a0d95b9b93cf1a3383616c3a44f4531
 DIST qtjambi-src-lgpl-4.5.0_01.tar.gz 4949615 RMD160 0590b536a9c7dd680e8730aa512c7935e07bbe46 SHA1 f1e6aa77f5b151fffe4d6d7a1ca468fa01c339f9 SHA256 2e136852e4314fbb1b64e08ad6f173bdf5ebdbdb62cb96de518b0a4e6a7dba2e
+DIST qtjambi-src-lgpl-4.5.2_01.tar.gz 4952790 RMD160 85070abfa33d530128b60c7377dde75f84a510b8 SHA1 7d144a280ae7ea3cfa2ef1edde43097a0c19c9db SHA256 1ce66dc56a633ee54c47a4ce3dc4939fd0bd04fd2726a4d85a28727ceee669e6
 EBUILD qtjambi-4.4.3.ebuild 4281 RMD160 c81b515da1d70ed75a79ed92c295614af5760da2 SHA1 7257bedc82b374c0b7ae623ccd0f68fd8f13b662 SHA256 d44387e629441920add6bf6d105ad5582014f8ca0cceb419c717d3e71b86907c
 EBUILD qtjambi-4.5.0_p1.ebuild 4955 RMD160 8ae814394e8ea07ec25ef6d139e445697996370c SHA1 ae675cf84e31863f1226f4fc2fff458d4ba26f7a SHA256 147dd845d4317a587b55c04657d7acd596096726bd3d8d584f45ba3b32a483cd
-MISC ChangeLog 4070 RMD160 cbd943ad9e47d8bb9d945a046f103a7fdc72385b SHA1 d1bacd1a78f20bf37f49884f5fa6ec8d921600be SHA256 159933e3b9d3eceee22c2a8992510131d460e982b1090c10367793d07c9fe8f7
+EBUILD qtjambi-4.5.2_p1.ebuild 5073 RMD160 20ef04825d8c3fa88ce2e6afd87bbc0d7aa1b438 SHA1 f66baf01a1691e7d6de817c10b05d3eb466ec862 SHA256 c83183eaf8427c0ec29990a9db199e26e8d682640045e4acc94541ec1cf78e1f
+MISC ChangeLog 4220 RMD160 20c5b58ac432322480122bb1716b88e369b0d06c SHA1 e0ff58a23f42263f956432029439cfb95ffd1ef4 SHA256 4a17f4bf2f2aeef07e94b4bfa6ff2ae746d84952c1fd03fb872f9e46b37e74b3
 MISC metadata.xml 374 RMD160 554c518b96dd5681f778395c1888891649e6ed55 SHA1 ae068aac6ddef644ebcd32899ec79e6bcc879282 SHA256 5e303995da64782af3b8e13149e0d4ba849fdd84c4967ac4a429b12e5a9ac50f
diff --git a/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild b/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
new file mode 100644
index 000000000000..ca772008f181
--- /dev/null
+++ b/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.1 2009/12/18 16:07:51 hwoarang Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="doc source"
+WANT_ANT_TASKS="ant-trax"
+
+inherit eutils multilib qt4 java-pkg-2 java-ant-2
+
+QTVER="${PV%%_p*}"
+MY_PV="${PV/p/0}"
+MY_P="${PN}-src-lgpl-${MY_PV}"
+
+DESCRIPTION="QtJambi is a set of Java bindings and utilities for the Qt C++ toolkit."
+HOMEPAGE="http://qt.nokia.com/"
+SRC_URI="http://get.qt.nokia.com/${PN}/source/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 GPL-3 )"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples opengl phonon webkit xmlpatterns"
+
+COMMON_DEPS=">=x11-libs/qt-gui-${QTVER}:${SLOT}
+	>=x11-libs/qt-sql-${QTVER}:${SLOT}
+	>=x11-libs/qt-svg-${QTVER}:${SLOT}
+	opengl? ( >=x11-libs/qt-opengl-${QTVER}:${SLOT} )
+	phonon? ( >=x11-libs/qt-phonon-${QTVER}:${SLOT} )
+	webkit? (
+		>=x11-libs/qt-phonon-${QTVER}:${SLOT}
+		>=x11-libs/qt-webkit-${QTVER}:${SLOT}
+	)
+	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:${SLOT} )"
+DEPEND="${COMMON_DEPS}
+	>=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEPS}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/generator-4.5.0_p1.patch \
+		"${FILESDIR}"/configuration-4.5.0_p1.patch \
+		"${FILESDIR}"/gcc4.4-4.5.0_p1.patch
+
+	# Respect MAKEOPTS
+	sed -i -e "/String arguments =/s|=.*|=\" ${MAKEOPTS}\";|" \
+		com/trolltech/tools/ant/MakeTask.java || die
+
+	java-ant_rewrite-classpath
+}
+
+qtjambi_use() {
+	if [[ $1 == "phonon" ]] && use webkit; then
+		# USE=webkit requires phonon support
+		echo "-Dgentoo.phonon=true"
+	else
+		echo "-Dgentoo.$1=$(use $1 && echo true || echo false)"
+	fi
+}
+
+qt_config_use() {
+	if [[ $1 == "phonon" ]] && use webkit; then
+		# USE=webkit requires phonon support
+		echo "QT_CONFIG+=phonon"
+	else
+		echo "QT_CONFIG$(use $1 && echo '+' || echo '-')=$1"
+	fi
+}
+
+src_compile() {
+	local myconf="-Dqtjambi.config=$(use debug && echo debug || echo release)
+			-Dlibrary.designer=true
+			$(qtjambi_use opengl)
+			$(qtjambi_use phonon)
+			$(qtjambi_use webkit)
+			$(qtjambi_use xmlpatterns)"
+	export QTDIR="/usr/$(get_libdir)/qt4"
+
+	einfo "Initializing Qt Jambi build environment"
+	eant -Dgentoo.classpath="$(java-pkg_getjar --build-only ant-core ant.jar)" \
+		${myconf} init
+
+	einfo "Merging XML files used by the Qt Jambi generator"
+	eant ${myconf} generator.xmlmerge
+
+	# Use eqmake4 instead of generator.qmake ant target
+	eqmake4 generator/generator.pro -o generator/Makefile
+
+	einfo "Building and running the generator"
+	eant ${myconf} generator.run   # implies generator.compile
+
+	# Use eqmake4 instead of library.native.qmake ant target
+	eqmake4 java.pro -recursive \
+		$(qt_config_use opengl) \
+		$(qt_config_use phonon) \
+		$(qt_config_use webkit) \
+		$(qt_config_use xmlpatterns)
+
+	einfo "Building the native library"
+	eant ${myconf} library.native.compile
+
+	einfo "Building the Java library"
+	eant ${myconf} library.java
+
+	einfo "Building the Designer library"
+	eant ${myconf} library.designer
+
+	if use examples; then
+		einfo "Building examples"
+		eant ${myconf} examples
+	fi
+
+	# Build API documentation
+	if use doc; then
+		einfo "Generating Javadoc"
+		javadoc -J-Xmx256m -d javadoc -subpackages com || die
+	fi
+
+	# Generate start script for jambi-designer
+	cat > bin/jambi-designer <<-EOF
+		#!/bin/sh
+		export LD_LIBRARY_PATH="/usr/$(get_libdir)/qt4:/usr/$(get_libdir)/${PN}-${SLOT}:\${LD_LIBRARY_PATH}"
+		export CLASSPATH="/usr/share/${PN}-${SLOT}/lib/${PN}.jar:/usr/share/${PN}-${SLOT}/lib/${PN}-designer.jar:\${CLASSPATH}"
+		export QT_PLUGIN_PATH="/usr/$(get_libdir)/qt4/plugins"
+		exec /usr/bin/designer "\$@"
+	EOF
+}
+
+src_install() {
+	dobin "${S}"/bin/* || die
+	newbin "${S}"/generator/generator jambi-generator || die
+
+	einfo "Installing jars"
+	java-pkg_newjar qtjambi-${MY_PV}.jar
+	java-pkg_newjar qtjambi-designer-${MY_PV}.jar ${PN}-designer.jar
+	java-pkg_dojar ant-qtjambi.jar
+
+	einfo "Installing native libraries"
+	java-pkg_doso "${S}"/lib/*
+
+	einfo "Installing designer plugins"
+	exeinto /usr/$(get_libdir)/qt4/plugins/${PN}
+	doexe plugins/designer/*.so || die
+	# Designer needs these libraries in both directories
+	dosym /usr/$(get_libdir)/qt4/plugins/${PN}/libJambiCustomWidget.so \
+		/usr/$(get_libdir)/qt4/plugins/designer/libJambiCustomWidget.so
+	dosym /usr/$(get_libdir)/qt4/plugins/${PN}/libJambiLanguage.so \
+		/usr/$(get_libdir)/qt4/plugins/designer/libJambiLanguage.so
+
+	if use doc; then
+		einfo "Installing documentation"
+		dohtml "${S}"/readme.html
+		java-pkg_dojavadoc "${S}"/javadoc
+	fi
+
+	if use examples; then
+		einfo "Installing examples"
+
+		# Get rid of class files before installing
+		find "${S}"/com/trolltech/examples -name '*.class' -delete || die
+
+		java-pkg_newjar qtjambi-examples-${MY_PV}.jar ${PN}-examples.jar
+		java-pkg_doexamples "${S}"/com/trolltech/examples
+		java-pkg_dolauncher jambi-examples --main com.trolltech.launcher.Launcher \
+			--java_args "-Djava.library.path=/usr/$(get_libdir)/qt4:/usr/$(get_libdir)/${PN}-${SLOT}"
+	fi
+
+	use source && java-pkg_dosrc "${S}"/com
+}