Pin Qt deps on 4.5, bug 298269. Remove obsolete versions.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 19 insertions, 327 deletions

diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog
index cd48cb1c402d..3bf5c92b90b7 100644
--- a/dev-java/qtjambi/ChangeLog
+++ b/dev-java/qtjambi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2009/12/18 16:07:51 hwoarang Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.23 2010/01/03 01:29:04 yngwin Exp $
+
+  03 Jan 2010; Ben de Groot <yngwin@gentoo.org> -qtjambi-4.4.3.ebuild,
+  -qtjambi-4.5.0_p1.ebuild, qtjambi-4.5.2_p1.ebuild:
+  Pin Qt deps on 4.5, bug 298269. Remove obsolete versions.
 
 *qtjambi-4.5.2_p1 (18 Dec 2009)
 
@@ -32,7 +36,7 @@
   07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   -qtjambi-4.3.3_p1.ebuild:
   Remove old version.
-  
+
   04 Mar 2009; Alistair Bush <ali_bush@gentoo.org>
   files/configuration-4.4.3.patch:
   Update to correct configuration patch. Old patch must have been applied
diff --git a/dev-java/qtjambi/qtjambi-4.4.3.ebuild b/dev-java/qtjambi/qtjambi-4.4.3.ebuild
deleted file mode 100644
index 1d456656f8a5..000000000000
--- a/dev-java/qtjambi/qtjambi-4.4.3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.4.3.ebuild,v 1.2 2009/01/19 15:15:48 yngwin Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-QTVERSION=4.4.2
-PATCHRELEASE=01
-
-DESCRIPTION="QtJambi is a set of Java bindings and utilities for the Qt C++ toolkit."
-HOMEPAGE="http://www.trolltech.com/"
-
-MY_PV=${PV}_${PATCHRELEASE}
-
-SRC_URI="ftp://ftp.trolltech.no/qtjambi/source/qtjambi-src-gpl-${MY_PV}.tar.gz"
-S=${WORKDIR}/qtjambi-src-gpl-${MY_PV}
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug sqlite opengl phonon webkit xmlpatterns examples"
-
-DEPEND=">=x11-libs/qt-gui-${QTVERSION}
-	>=virtual/jdk-1.5
-	dev-java/ant-trax
-	sqlite? ( dev-db/sqlite )
-	opengl? ( >=x11-libs/qt-opengl-${QTVERSION} )
-	phonon? ( >=x11-libs/qt-phonon-${QTVERSION} )
-	webkit? ( >=x11-libs/qt-webkit-${QTVERSION} )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVERSION} )"
-
-RDEPEND=">=x11-libs/qt-gui-${QTVERSION}
-	>=virtual/jre-1.5
-	sqlite? ( dev-db/sqlite )
-	opengl? ( >=x11-libs/qt-opengl-${QTVERSION} )
-	phonon? ( >=x11-libs/qt-phonon-${QTVERSION} )
-	webkit? ( >=x11-libs/qt-webkit-${QTVERSION} )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVERSION} )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/generator-${PV}.patch"
-	epatch "${FILESDIR}/configuration-${PV}.patch"
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-
-	cd "${S}"
-
-	# Set build configuration
-	local extraArgs="-Dgentoo.qtdir=/usr/$(get_libdir)/qt4"
-
-	use debug && extraArgs="${extraArgs} -Dqtjambi.config=debug"
-
-	if use sqlite ; then
-	  extraArgs="${extraArgs} -Dgentoo.sqlite=true"
-	else
-	  extraArgs="${extraArgs} -Dgentoo.sqlite=false"
-	fi
-
-	if use opengl ; then
-	  extraArgs="${extraArgs} -Dgentoo.opengl=true"
-	else
-	  extraArgs="${extraArgs} -Dgentoo.opengl=false"
-	fi
-
-	if use phonon ; then
-	  extraArgs="${extraArgs} -Dgentoo.phonon=true"
-	else
-	  extraArgs="${extraArgs} -Dgentoo.phonon=false"
-	fi
-
-	if use webkit ; then
-	  extraArgs="${extraArgs} -Dgentoo.webkit=true"
-	else
-	  extraArgs="${extraArgs} -Dgentoo.webkit=false"
-	fi
-
-	if use xmlpatterns ; then
-	  extraArgs="${extraArgs} -Dgentoo.xmlpatterns=true"
-	else
-	  extraArgs="${extraArgs} -Dgentoo.xmlpatterns=false"
-	fi
-
-	# Step 1, Build and run the Qt Jambi generator. The generator relies on QTDIR for include.
-	einfo "Building and running the Qt Jambi generator"
-	ANT_TASKS="ant-trax" QTDIR="/usr/include/qt4" eant -Dgentoo.classpath="$(java-pkg_getjar --build-only ant-core ant.jar)" ${extraArgs} generator
-
-	# Step 2, Build the native library
-	einfo "Building the native library"
-	eant ${extraArgs} library.native.qmake library.native.compile
-
-	# Step 3, Build the Java library
-	einfo "Building the Java library"
-	eant ${extraArgs} library.java
-
-	# Step 4, Build the Examples
-	use examples && einfo "Building Examples" && eant ${extraArgs} examples
-
-	# Step 5, Build API documentation
-	use doc && einfo "Generating Javadoc" && javadoc -J-Xmx128m -d javadoc -subpackages com
-
-	# Step 6, generate start script for jambi-designer
-	cat > bin/jambi-designer <<-EOF
-		#! /bin/sh
-		LD_LIBRARY_PATH=/usr/lib/qt4 CLASSPATH=/usr/share/qtjambi-4/lib/qtjambi.jar:\${CLASSPATH} /usr/bin/designer
-	EOF
-}
-
-src_install() {
-
-	# Install built jar
-	java-pkg_newjar qtjambi-${MY_PV}.jar
-
-	# Install examples jar
-	use examples && java-pkg_newjar qtjambi-examples-${MY_PV}.jar ${PN}-examples.jar
-
-	# Install designer plugins
-	insinto "/usr/$(get_libdir)/qt4/plugins/designer"
-	insopts -m0755
-	doins plugins/designer/*.so
-
-	# Install native library
-	#java-pkg_doso "${S}"/lib/* # does not work see #251500
-	java-pkg_doso "${S}"/lib/*.so.1.0.0 "${S}"/lib/*.so.1.0 "${S}"/lib/*.so.1 "${S}"/lib/*.so # works
-
-	# Install sources
-	use source && java-pkg_dosrc "${S}"/com
-
-	# Install javadoc
-	use doc && java-pkg_dojavadoc "${S}"/javadoc
-
-	# Install other documentation
-	use doc && dohtml "${S}"/readme.html
-
-	# Install examples
-	use examples && java-pkg_doexamples "${S}"/com/trolltech/examples
-
-	# Install launcher-scripts
-	dobin "${S}"/bin/*
-	use examples && java-pkg_dolauncher jambi --main com.trolltech.launcher.Launcher \
-		--java_args "-Djava.library.path=/usr/$(get_libdir)/qt4:/usr/$(get_libdir)/qtjambi-4"
-}
diff --git a/dev-java/qtjambi/qtjambi-4.5.0_p1.ebuild b/dev-java/qtjambi/qtjambi-4.5.0_p1.ebuild
deleted file mode 100644
index eefde0023385..000000000000
--- a/dev-java/qtjambi/qtjambi-4.5.0_p1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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.0_p1.ebuild,v 1.1 2009/07/22 07:29:15 ali_bush Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils qt4 java-pkg-2 java-ant-2 toolchain-funcs
-
-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://www.qtsoftware.com/"
-SRC_URI="http://get.qtsoftware.com/${PN}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-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-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-${PV}.patch"
-	epatch "${FILESDIR}/configuration-${PV}.patch"
-
-	if [[ $(gcc-version) == "4.4" ]] ; then
-		epatch "${FILESDIR}/gcc4.4-${PV}.patch"
-	fi
-
-	# Respect MAKEOPTS
-	sed -i -e "/String arguments =/s|=.*|=\" ${MAKEOPTS}\";|" \
-		com/trolltech/tools/ant/MakeTask.java || die
-
-	java-ant_rewrite-classpath
-}
-
-qtjambi_use() {
-	echo "-Dgentoo.${2:-$1}=$(use $1 && echo true || echo false)"
-}
-
-qt_config_use() {
-	echo "QT_CONFIG$(use $1 && echo '+' || echo '-')=$1"
-}
-
-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/*` does not work (bug #251500)
-	java-pkg_doso "${S}"/lib/*.so.1.0.0 "${S}"/lib/*.so.1.0 "${S}"/lib/*.so.1 "${S}"/lib/*.so
-
-	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
-}
diff --git a/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild b/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
index ca772008f181..0f9e69a1ef7f 100644
--- a/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
+++ b/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.5.2_p1.ebuild,v 1.2 2010/01/03 01:29:04 yngwin Exp $
 
 EAPI="2"
 
 JAVA_PKG_IUSE="doc source"
 WANT_ANT_TASKS="ant-trax"
 
-inherit eutils multilib qt4 java-pkg-2 java-ant-2
+inherit multilib qt4-r2 java-pkg-2 java-ant-2
 
-QTVER="${PV%%_p*}"
+QTVER="${PV%.*}*"
 MY_PV="${PV/p/0}"
 MY_P="${PN}-src-lgpl-${MY_PV}"
 
@@ -22,16 +22,16 @@ 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} )
+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}
+		=x11-libs/qt-phonon-${QTVER}:${SLOT}
+		=x11-libs/qt-webkit-${QTVER}:${SLOT}
 	)
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:${SLOT} )"
+	xmlpatterns? ( =x11-libs/qt-xmlpatterns-${QTVER}:${SLOT} )"
 DEPEND="${COMMON_DEPS}
 	>=virtual/jdk-1.6"
 RDEPEND="${COMMON_DEPS}