Version bump, remove old.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 32 insertions, 198 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/Manifest b/dev-qt/qt-mobility/Manifest
index 190402224ea5..55397d09225a 100644
--- a/dev-qt/qt-mobility/Manifest
+++ b/dev-qt/qt-mobility/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qt-mobility-1.2.2_p20120403.tar.gz 22789546 SHA256 4b9aabfda8d1eab6b91c6c5732c536fe74204988fb3f3e8f9c197f2ecbbd680a SHA512 d3f1df3f41d3074a8bd4281aca2158647068a81aa40124ba8b1d48f3c323f5a2b64dc2e21a691e68af96cbdeba3cd86115b66e934b83dbe61b2199ba63f6814b WHIRLPOOL cb1b10af080f1c468bec0c06bf5e0f70d2ae58ec9d76f1bcd68b991d6de42fa5964a89fea3a1adb90a2291cce0f5f96b8c51007ae888e13c4d5024f0d10f4767
-DIST qt-mobility-1.2.2_p20121205.tar.gz 23398818 SHA256 04704777136cbeeb3366cdb29087cc1435e149b3def245caafda4ab17da886e6 SHA512 7894b5ef4e1f6d5ab04ae895274cdf639679c5a7349df8b9bdd08c7d2e616872f955a2bf9d98fd4b3b54abbca53001b969ad49251723edf7bdbfb86e7b0f9486 WHIRLPOOL 7070eebdaf8c12cd6c7f6eb52f03d1f247cb70f8f25257c94ef98f709a8e73cf374f705a1a000d957d65bf053c575de483ccde93a8117b86143159559dc7961e
-EBUILD qt-mobility-1.2.2_p20120403.ebuild 4137 SHA256 6b23bea5dd1da63e7a40b0e2aef225a0f06acaa67b788904994114e0e3ed380c SHA512 74cd6eb2894a258745f5c8685e543377b4af5812f870f05c84f676e4afae31c159beb85643fa1ba88f24e8f246df2f3ad73cfd1f716638aa729186cce9a0fc1e WHIRLPOOL 85506d16b52aee2c546be42a543592c07d4719591d0c360e14949b362eafc997d76514d25261d4ca5e3e2048a12d823f8cd05504df23bddf2fb61e4c3e0af282
-EBUILD qt-mobility-1.2.2_p20121205.ebuild 4143 SHA256 f7d5f91cad01b3db9104e21ba529e2948fc788f0ade6a207c2b2413072b1ff6b SHA512 9badd014d2c51ea5ab9f673731b486614a574a176dff562856555e15c3248794c54775a1673600a48124c602d0ea0320cbc43c445c428d7298b9e19b48067787 WHIRLPOOL 39eca1da0fa27d35c521f62243499ee8fa29c037589447c26a158c3b79de3e1c91db8d70d003a83877c380d51dd882281d8a1819c613b996cdaea35cf31b9d0f
-MISC ChangeLog 2218 SHA256 0b24fe93e2b320dc30f1e73af805fe6be9419bd36c344121ca53a956e325381d SHA512 8609876e8ad71b04d0927d6430dc1278de925072e096ce13746e6ced3eb083f0560c0249c712bcfa08adcae9e530193140fef747cff47a1ed978e1193eb2b839 WHIRLPOOL d01783507dafa4a03e5ceb374be8a59aa358bae0e26f4c0b648d9f9dc34f3ba626eb0eac38e8595ae73bf9d6bd9cca27600e25d28d22659fa6bf5bd983a06eeb
+DIST qt-mobility-1.2.2_p20130703.tar.xz 16748672 SHA256 c4f1578a8384a520744ece9c19639600029d1fac2b55e0f110ec5700911aad44 SHA512 51e960dbcab3641906043c0e3dc6c44da2a66d11a15f5ec255776cef299d1403eeb0df55ee953567fdafd4c2a88a6514dcf1e2f8ba0af574c44e02e809f42287 WHIRLPOOL 4e7ee4039fbb4e8f8cfd7f720d232ddf79d61c3cd62ad5851e490c9284badf3431852eb56dfea18e3caf350e2e0ccd50f3244abc04bd68ffc6f6de67e644d3c4
+EBUILD qt-mobility-1.2.2_p20130703.ebuild 3939 SHA256 37b80c45e22eeddb803bfcd8c7c8b7029cef441d0ebc699cb10cf28a0c14b17e SHA512 46741409b2bb2a2933dc21e57cd09c36da99937be3f284a65cb6aa7ac02bc99ce3f5fb7416051961a567cd24734a2b5ce8bb1e2e9c048d44ba8617fedd604e1a WHIRLPOOL 8475e8c823067d46e19e0ff9e9cdcdc192f4a49b067a64ace7adf7e5b4eb699c32c964fe06594b71799149a34e800d04f9860336a0c49507a3af7199921ec940
+MISC ChangeLog 2454 SHA256 393bd117a2c20634b3621ce0794f10760049455e74937051074bbd0f651b4b8f SHA512 3bba21d4bc3008914519d625f2550a3137de5884076fa2f320b344c3c9f8ffeabf3f019decffdd34f92aec61acba2f11693c2fb733d7d9269b4710276f0a6f93 WHIRLPOOL 2af7cbb21715b1a635e6d0ac720390000a81a3b4d498ef3a0f216993b176b6e501b0dd7ee2d31073b23fa3ea30cd6316291b5f14366a18e51ed8474ec39e4fef
 MISC metadata.xml 1592 SHA256 8ec9afd91308148afcd0a18478b0e73db41f74b023fa44a19628b433a30709d0 SHA512 2df264ec0dfa38960e379f7dd096aaa9b934315c0867844d5aa1f39578adc06c188541b57c920a1cf1d7623edc0c5f1985719616381c50c67b51f4585494bf3f WHIRLPOOL e636439f495841539fdf339a312d0cf55bf35ed1527402649675721a5c2de523facddedd941382a486769cf8d362943c2aead7dbb5700d04d178e79d22dcd901
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMhnXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziludP0P/1PlYkDaHU/18Fa3grH+/YNV
-DQpzZsba/uPhXoC16tzlyg4DYeXUwmcgr7i9amQEL0k3ochV/fvNqC+dyCBU1D54
-5ewXxx/otVpafuI3zlk+mFvpDlUjEvLsRcrs4CiGG/XER+ZwBJ7WURzpSKL6gVMC
-l1NA05TE2LBaykIWWELBIOOxaravh5QydICRIQjswiSwOff7cH2puG3SC40Uc7xi
-+2RPwSPLD2yTaM1arnMLqNODM5zPzAFKBr7JrLzfGA9Hi+YpyTi7kFCGhaY7QBOV
-XuJRNd10t209RGu+a48Gfh1PIxFLqTbMOQRq1vx3LUPu6wMIyZO82Lf2ev5l1/YF
-jSI1GfBA2GSPqF2dJ5Us1sst6b+7XLCsxJarOW5aSKGrcjidlZRoT7N7SpmHJVNC
-WHu11pZb4C8HbBRj/cIiD8IAHkVlD/5rysFoufBPhV7086WNWNUlM9FHYU8jJE5i
-XZkMQIyY2qv/2A7NaTZP3MLvhVBqun837J4nakOcVS4GNCq4P0WPNlfFpl0sG13G
-mJHoKmm59LZBeHiIFakWH8tNGlX3NZV6nsB+6HHJf84QxRzms3bUNTvrkZ5nOiSM
-5GqRcxGUYCw8bXUtLKmL1T1VqMDiD40mN2oIu+dEJFbSzy7yeBjqlvYqZFVTwCo3
-8Nkqc5o1cLwmwEcD+NXl
-=vBuL
+iQIcBAEBCAAGBQJSCCYqAAoJENXLsxwXqFxyG5cP/RVOrv0AtEkAUqrMQWutnbMH
+SFRTZkzr6U44UvoHrKT0ZYdz1CO8urCLqB3gKrR3T0hhGGmYVKy7741fDVhh7/Tx
+L2P45a9F3FbrmfYECDGqjDIG2oFbSQVNn0qqeAIUSivBgXBtSWydS+JOVPki/2kl
+98xFCNyRChUS/Lu6IkIN9jSnZoOFCEwYjdYv25OfHH+ovKZroxZQKw162Jx6JML+
+PWzU25vIQPnqJlLYUOxuI3QmsMCd98sax+BZf9Pc6uL3JYu8BWewoHTWfxHnxhua
+3pAFmJp7SwPWf6OB5NOxf5B0aDXN9CYCaSepsj1N5a5mQjyh318g9P7m0aZMN4/j
+LcB2YqnqZjG33m0qJqM/RGsLz7zkxd+9VV5fjyLaLzXO8uRw4jNm11pxKZknAVbn
+7pZMNYsmbhO4C9T+kJpZb3SkfTI4QgpKsF51emE6WiRNLatj8mlxBqI9J6h6avq5
+vxfzXtVoNilfCqh/x04cbEFDASlntGA/83L8gh4CKXoHLfsMisc0WFJOtRn04+k/
+YPeUn6VbJ/XBxw7Z7/S657W2YUFdMJkjMzDeWykWnklkMysRgVohIEg5tEGIpdtz
+/f1tzzUBknuG7NNhcFuw7munuThMj/FKe5XrOG4LaBqvqlBP1Z3JbbGBVY2Znbn+
+EqetndudxnWnVRuloyvQ
+=k+uz
 -----END PGP SIGNATURE-----
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