Version bump, remove old.

(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 15 insertions, 177 deletions

diff --git a/dev-qt/qt-mobility/ChangeLog b/dev-qt/qt-mobility/ChangeLog
index c633b02d4902..3c1a4c495262 100644
--- a/dev-qt/qt-mobility/ChangeLog
+++ b/dev-qt/qt-mobility/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qt-mobility
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/ChangeLog,v 1.1 2013/03/02 15:25:04 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/ChangeLog,v 1.2 2013/08/12 00:02:16 pesa Exp $
+
+*qt-mobility-1.2.2_p20130703 (12 Aug 2013)
+
+  12 Aug 2013; Davide Pesavento <pesa@gentoo.org>
+  +qt-mobility-1.2.2_p20130703.ebuild, -qt-mobility-1.2.2_p20120403.ebuild,
+  -qt-mobility-1.2.2_p20121205.ebuild:
+  Version bump, remove old.
 
 *qt-mobility-1.2.2_p20121205 (05 Dec 2012)
 
diff --git a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild
deleted file mode 100644
index 9951858d84de..000000000000
--- a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20121205.ebuild,v 1.1 2013/03/02 15:25:04 yngwin Exp $
-
-EAPI=4
-
-inherit multilib qt4-r2 toolchain-funcs
-
-DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
-HOMEPAGE="http://qt.nokia.com/products/qt-addons/mobility"
-SRC_URI="http://dev.gentoo.org/~kensington/distfiles/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-QT_MOBILITY_MODULES=(bearer connectivity +contacts feedback gallery
-		location messaging multimedia organizer publishsubscribe
-		sensors serviceframework systeminfo versit)
-IUSE="bluetooth debug doc networkmanager pulseaudio qml +tools
-	${QT_MOBILITY_MODULES[@]}"
-
-REQUIRED_USE="
-	|| ( ${QT_MOBILITY_MODULES[@]#[+-]} )
-	versit? ( contacts )
-"
-
-RDEPEND="
-	>=dev-qt/qtcore-4.7.0:4
-	bearer? (
-		networkmanager? (
-			net-misc/networkmanager
-			>=dev-qt/qtdbus-4.7.0:4
-		)
-	)
-	connectivity? (
-		>=dev-qt/qtdbus-4.7.0:4
-		bluetooth? ( net-wireless/bluez )
-	)
-	contacts? ( >=dev-qt/qtgui-4.7.0:4 )
-	gallery? ( >=dev-qt/qtdbus-4.7.0:4 )
-	location? (
-		>=dev-qt/qtdeclarative-4.7.0:4
-		>=dev-qt/qtgui-4.7.0:4
-		>=dev-qt/qtsql-4.7.0:4[sqlite]
-	)
-	messaging? ( >=net-libs/qmf-2.0_p201209 )
-	multimedia? (
-		media-libs/alsa-lib
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-bad:0.10
-		media-libs/gst-plugins-base:0.10
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-		>=dev-qt/qtgui-4.8.0-r4:4[xv]
-		>=dev-qt/qtopengl-4.8.0:4
-		pulseaudio? ( media-sound/pulseaudio[alsa] )
-	)
-	publishsubscribe? (
-		tools? ( >=dev-qt/qtgui-4.7.0:4 )
-	)
-	qml? ( >=dev-qt/qtdeclarative-4.7.0:4 )
-	serviceframework? (
-		>=dev-qt/qtdbus-4.7.0:4
-		>=dev-qt/qtsql-4.7.0:4[sqlite]
-		tools? ( >=dev-qt/qtgui-4.7.0:4 )
-	)
-	systeminfo? (
-		sys-apps/util-linux
-		virtual/udev
-		x11-libs/libX11
-		x11-libs/libXrandr
-		>=dev-qt/qtdbus-4.7.0:4
-		>=dev-qt/qtgui-4.7.0:4
-		bluetooth? ( net-wireless/bluez )
-		networkmanager? ( net-misc/networkmanager )
-	)
-	versit? ( >=dev-qt/qtgui-4.7.0:4 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	multimedia? (
-		sys-kernel/linux-headers
-		x11-proto/videoproto
-	)
-	systeminfo? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	connectivity? (
-		bluetooth? ( app-mobilephone/obexd )
-	)
-"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# disable building of code snippets in doc/
-	# and translations (they aren't actually translated)
-	sed -i -re '/SUBDIRS \+= (doc|translations)/d' qtmobility.pro || die
-
-	# fix automagic dependency on qt-declarative
-	if ! use qml; then
-		sed -i -e '/SUBDIRS += declarative/d' plugins/plugins.pro || die
-	fi
-}
-
-src_configure() {
-	# figure out which modules to build
-	local modules=
-	for mod in "${QT_MOBILITY_MODULES[@]#[+-]}"; do
-		use ${mod} && modules+="${mod} "
-	done
-
-	if use messaging; then
-		# tell qmake where QMF is installed
-		export QMF_INCLUDEDIR=$($(tc-getPKG_CONFIG) --variable includedir qmfclient)
-		export QMF_LIBDIR=$($(tc-getPKG_CONFIG) --variable libdir qmfclient)
-	fi
-
-	# custom configure script
-	local myconf=(
-		./configure
-		-prefix "${EPREFIX}/usr"
-		-headerdir "${EPREFIX}/usr/include/qt4"
-		-libdir "${EPREFIX}/usr/$(get_libdir)/qt4"
-		-plugindir "${EPREFIX}/usr/$(get_libdir)/qt4/plugins"
-		$(use debug && echo -debug || echo -release)
-		$(use doc || echo -no-docs)
-		$(use tools || echo -no-tools)
-		-modules "${modules}"
-	)
-	echo "${myconf[@]}"
-	"${myconf[@]}" || die "configure failed"
-
-	# fix automagic dependency on bluez
-	if ! use bluetooth; then
-		sed -i -e '/^bluez_enabled =/s:yes:no:' config.pri || die
-	fi
-	# fix automagic dependency on networkmanager
-	if ! use networkmanager; then
-		sed -i -e '/^networkmanager_enabled =/s:yes:no:' config.pri || die
-	fi
-	# fix automagic dependency on pulseaudio
-	if ! use pulseaudio; then
-		sed -i -e '/^pulseaudio_enabled =/s:yes:no:' config.pri || die
-	fi
-
-	eqmake4 -recursive
-}
-
-src_compile() {
-	qt4-r2_src_compile
-
-	use doc && emake docs
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	if use doc; then
-		dohtml -r doc/html/*
-		dodoc doc/qch/qtmobility.qch
-		docompress -x /usr/share/doc/${PF}/qtmobility.qch
-	fi
-}
diff --git a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20120403.ebuild b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild
index 7762a6891e01..5fc0a5d38c56 100644
--- a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20120403.ebuild
+++ b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20120403.ebuild,v 1.1 2013/03/02 15:25:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild,v 1.1 2013/08/12 00:02:16 pesa Exp $
 
 EAPI=4
 
 inherit multilib qt4-r2 toolchain-funcs
 
 DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
-HOMEPAGE="http://qt.nokia.com/products/qt-addons/mobility"
-SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.gz"
+HOMEPAGE="http://qt-project.org/wiki/Category:Developing_with_Qt::QtMobility"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -111,12 +111,6 @@ src_configure() {
 		use ${mod} && modules+="${mod} "
 	done
 
-	if use messaging; then
-		# tell qmake where QMF is installed
-		export QMF_INCLUDEDIR=$($(tc-getPKG_CONFIG) --variable includedir qmfclient)
-		export QMF_LIBDIR=$($(tc-getPKG_CONFIG) --variable libdir qmfclient)
-	fi
-
 	# custom configure script
 	local myconf=(
 		./configure
@@ -136,10 +130,12 @@ src_configure() {
 	if ! use bluetooth; then
 		sed -i -e '/^bluez_enabled =/s:yes:no:' config.pri || die
 	fi
+
 	# fix automagic dependency on networkmanager
 	if ! use networkmanager; then
 		sed -i -e '/^networkmanager_enabled =/s:yes:no:' config.pri || die
 	fi
+
 	# fix automagic dependency on pulseaudio
 	if ! use pulseaudio; then
 		sed -i -e '/^pulseaudio_enabled =/s:yes:no:' config.pri || die