Remove old.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 23 insertions, 193 deletions

diff --git a/x11-libs/qt-mobility/ChangeLog b/x11-libs/qt-mobility/ChangeLog
index 9a9ee33857f6..18d69085bc6e 100644
--- a/x11-libs/qt-mobility/ChangeLog
+++ b/x11-libs/qt-mobility/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-mobility
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v 1.7 2012/06/21 13:45:40 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/ChangeLog,v 1.8 2012/08/12 01:11:57 pesa Exp $
+
+  12 Aug 2012; Davide Pesavento <pesa@gentoo.org> -qt-mobility-1.2.0.ebuild,
+  metadata.xml:
+  Remove old.
 
   21 Jun 2012; Davide Pesavento <pesa@gentoo.org>
   qt-mobility-1.2.2_p20120403.ebuild:
@@ -34,4 +38,3 @@
   10 Nov 2011; Davide Pesavento <pesa@gentoo.org> +qt-mobility-1.2.0.ebuild,
   +metadata.xml:
   Initial commit, imported from qting-edge overlay.
-
diff --git a/x11-libs/qt-mobility/Manifest b/x11-libs/qt-mobility/Manifest
index 9c435d8e0739..a86cad330f18 100644
--- a/x11-libs/qt-mobility/Manifest
+++ b/x11-libs/qt-mobility/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST qt-mobility-1.2.2_p20120403.tar.gz 22789546 RMD160 b8dd820586c8d4e7cdcbd192b1dcc74c44cbd022 SHA1 cb13a06e62c95b0ef3bf089b4f58ccdc014d75b0 SHA256 4b9aabfda8d1eab6b91c6c5732c536fe74204988fb3f3e8f9c197f2ecbbd680a
-DIST qt-mobility-opensource-src-1.2.0.tar.gz 37179556 RMD160 c8c3c6c301e90a2ba9a2a249569084b9c3923322 SHA1 090d1cc0d9c27f41d6fc9022b80ab5579af5e46d SHA256 ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44
-EBUILD qt-mobility-1.2.0.ebuild 4252 RMD160 55f7cb1e56db9d81377e3d935911119924679be3 SHA1 744a756d6b10af8d944f4fc8663f069df0195cdd SHA256 ea5196a13241a057947554b09197c22f6158ae41558dd245f255d525da39813c
-EBUILD qt-mobility-1.2.2_p20120403.ebuild 4174 RMD160 364785c28d0721851146e8d6b3c03f534df31404 SHA1 f85054a9d07a03828f39a912ab1ea342327dd94b SHA256 94d7b312f7489bde1f803f0634072d01a2ae5441d243037faa9bd9bcd43d4842
-MISC ChangeLog 1476 RMD160 657eabf4c59560050812f56a01669f777671e21a SHA1 7dc02ae5ff9a77558bd1061dd8b4073fccb9f67a SHA256 4a9fe39c6f1f98c756691f3413b02fc73796a74e6c5e3205c6dee6bbf710830c
-MISC metadata.xml 1668 RMD160 012bfb5518f3dfc94c407a7f6cf18baacbd400ca SHA1 9634ff63090367a1d17cc554c08017640f3f9723 SHA256 29164db30416e4bb13e6024b24033d54787b806e2073ddce0f5fdbe69628a885
+DIST qt-mobility-1.2.2_p20120403.tar.gz 22789546 SHA256 4b9aabfda8d1eab6b91c6c5732c536fe74204988fb3f3e8f9c197f2ecbbd680a SHA512 d3f1df3f41d3074a8bd4281aca2158647068a81aa40124ba8b1d48f3c323f5a2b64dc2e21a691e68af96cbdeba3cd86115b66e934b83dbe61b2199ba63f6814b WHIRLPOOL cb1b10af080f1c468bec0c06bf5e0f70d2ae58ec9d76f1bcd68b991d6de42fa5964a89fea3a1adb90a2291cce0f5f96b8c51007ae888e13c4d5024f0d10f4767
+EBUILD qt-mobility-1.2.2_p20120403.ebuild 4174 SHA256 94d7b312f7489bde1f803f0634072d01a2ae5441d243037faa9bd9bcd43d4842 SHA512 83f1c09b56ea0b272a27d065277d56e8cc8aa6d1e596c5579cece7dfdbf17a964d5b582f80f0b5c4443029097dc9ebab3d1cac22ecebc5faf22052d69b1958fe WHIRLPOOL 775215ac5467507d894ea8af11bf2f75077946c6f071f35dafc04cdf2c8d6f2240d2e8dc7986dab453eaf8064aef941f44a30b480654c91c92e4ebbe82418ed8
+MISC ChangeLog 1583 SHA256 92fff1591a9b3607039d0d70351179ded5f89ace22cbd467edb4ad237efc2c8c SHA512 f5fedf931533309b7a87001f69e3acc02d3f2d09220fa3c7b0df3a40b95d836c991562e24792a395bc00ee53ffa973a707ddb2f1f2ad0191dda252a5129c16f2 WHIRLPOOL 3d95154fcec40b52c9ab63932813d64ef324ccc6b97f559e1fcd75c74987b9d771ac17afb8b06d395fc4fb73437676ed9a7c15e60814af787d68075bf771bc79
+MISC metadata.xml 1592 SHA256 8ec9afd91308148afcd0a18478b0e73db41f74b023fa44a19628b433a30709d0 SHA512 2df264ec0dfa38960e379f7dd096aaa9b934315c0867844d5aa1f39578adc06c188541b57c920a1cf1d7623edc0c5f1985719616381c50c67b51f4585494bf3f WHIRLPOOL e636439f495841539fdf339a312d0cf55bf35ed1527402649675721a5c2de523facddedd941382a486769cf8d362943c2aead7dbb5700d04d178e79d22dcd901
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP4yWUAAoJENXLsxwXqFxy8FIP/1e9EpKAc2Qcls+knJ4WUs66
-rwUVSlCCzBIkHMw6SwuMoLNjjLikyDzAv2jrK7n1hn3qiu1eJvDujSBRw07qV4Z8
-DYxKlAGYIrDx3SJw/yqIIOdvsuqHHPzqejydS4tELOGi36n+S7YnDKvFoEBgFzyw
-Q/0nY6UugGIcwevk2MyxSfpq/fzE/mu+oPzJnGkevYzH+UV2fZULrUEqId2gXZud
-UhZ3gVsJy+gCXdx9Vzw1+ZdYMUm0OJRF6caNrwdMjNH6ZTmH/L1RFyLaauW+v2IZ
-1SDTcQSYClk9teDwn4+bJcnZULFpojiKOZFy8vEKfEsxlybZcR0SzlsW3Xuoj5t8
-KRlDmwTazQ3wNimj9z1+4+7cJ9YgTPC1EQilpxHd1DO/DSa4zLrFaJ1AuDa4X2f8
-qjXDA/hERer8T5eDWZdcftZt9TkeDL7dM6e92Q8KXzlIYcB2HgOs7RjC9LsXGlNr
-tOHss1G1N7tsff/rikS/yhEkDg0CbsYRFAXqcn0WlOz8Og/zRMCTWqaugmoYtTEE
-OOzHwu916pbtnwen9osgdVUpGFBiWyM9uS6tg2PMJRylHZVoLn08Gv9coOwar2vW
-rmapFihzzcS4o74+IAsERWSnHaWrmXEC1c6HKwvsg6wzGsqF36D5UydU0c98+EV1
-MVaIQ5jllrXD85eQ/QEV
-=OaRQ
+iQIcBAEBCAAGBQJQJwLvAAoJENXLsxwXqFxyIVEP/jvcfHojS1O19F57b2DrMZv1
+gr++NE7TMgi9yA6ZHNNth1EGXM6nlG+09+RZ5lQoZn0qI2rwgiWKpM6RJJrTw5gP
+bmyM0SQZlPqNLuB5GNN7Sr/iZeR2Usr/eRjlA3fnRB44zOijeq5trv12wqrYmTLu
+6PQq4atoTo7EIbF0rVtRY5B3UPZM3wQuamhrsMBRBS4trGNKKJ98ppUaxucF/FyF
+Suw4Fy1RK4q3zx+KFqrCa5CKo4KFow7Q+Ogf+0Qd2XKWSnIsjnGdkAr5v2jvp8KW
+jOsaugZMk/4e2rAbuLnOkjR3BzYcsA6O1iz59a8ucwR1/WvbHFR9pbxA7zT6ZFh8
+tkCkEBqFZoyPhbs03hrb1EZ9laqIQDvg+C0ws7NwpDKCMzoqUeGibkM3aS3imIRx
+PWMSJ8ySW1+7vdTA3WUt8mTiamYOlu3MGhIY/cER/daYQ8JsxiUxqREN2Bs5WS8r
+pp/4+ZYCDbut3HxuEbYX9msfiqI2I9UHE7WhETQHKvryd6ZjTZo8L3eDrW/5c8oL
+GMNieYAX1A9dm0wCyW1bdPyI1AfGYg8Ldzb6cmOriYq8Z4eiJ12CKxcaQs8z2FZi
+O7Jh5FI7/bhyMNrGmdVmEwB4QWqb8+gxbMb4lMONjgwe5fcAFO5naOZt8QjSRjWf
+tINF/eQkFfGe9z7UcUIb
+=GK9z
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-mobility/metadata.xml b/x11-libs/qt-mobility/metadata.xml
index fba95dbdea3a..3ab50157272e 100644
--- a/x11-libs/qt-mobility/metadata.xml
+++ b/x11-libs/qt-mobility/metadata.xml
@@ -13,7 +13,6 @@
 	<flag name="messaging">Build the QtMessaging module</flag>
 	<flag name="multimedia">Build the QtMultimediaKit module</flag>
 	<flag name="networkmanager">Enable NetworkManager support in QtBearer and QtSystemInfo modules</flag>
-	<flag name="opengl">Enable OpenGL support in QtMultimediaKit module</flag>
 	<flag name="organizer">Build the QtOrganizer module</flag>
 	<flag name="publishsubscribe">Build the QtPublishSubscribe module</flag>
 	<flag name="pulseaudio">Enable PulseAudio support in QtMultimediaKit module</flag>
diff --git a/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild b/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild
deleted file mode 100644
index e31d402258fb..000000000000
--- a/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-mobility/qt-mobility-1.2.0.ebuild,v 1.4 2012/05/02 17:16:06 pesa Exp $
-
-EAPI=4
-
-inherit multilib qt4-r2
-
-MY_P="${PN}-opensource-src-${PV}"
-
-DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
-HOMEPAGE="http://qt.nokia.com/products/qt-addons/mobility"
-SRC_URI="http://get.qt.nokia.com/qt/add-ons/${MY_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 opengl pulseaudio qml +tools
-	${QT_MOBILITY_MODULES}"
-
-REQUIRED_USE="
-	versit? ( contacts )
-"
-
-RDEPEND="
-	=x11-libs/qt-core-4.7*
-	bearer? (
-		networkmanager? (
-			net-misc/networkmanager
-			=x11-libs/qt-dbus-4.7*
-		)
-	)
-	connectivity? (
-		=x11-libs/qt-dbus-4.7*
-		bluetooth? ( net-wireless/bluez )
-	)
-	gallery? ( =x11-libs/qt-dbus-4.7* )
-	location? (
-		=x11-libs/qt-gui-4.7*
-		=x11-libs/qt-sql-4.7*[sqlite]
-	)
-	messaging? ( ~net-libs/qmf-2.0_p201143 )
-	multimedia? (
-		media-libs/alsa-lib
-		>=media-libs/gstreamer-0.10.19:0.10
-		>=media-libs/gst-plugins-base-0.10.19:0.10
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-		=x11-libs/qt-gui-4.7*
-		opengl? ( =x11-libs/qt-opengl-4.7* )
-		pulseaudio? ( media-sound/pulseaudio[alsa] )
-	)
-	publishsubscribe? (
-		tools? ( =x11-libs/qt-gui-4.7* )
-	)
-	qml? ( =x11-libs/qt-declarative-4.7* )
-	serviceframework? (
-		=x11-libs/qt-dbus-4.7*
-		=x11-libs/qt-sql-4.7*[sqlite]
-		tools? ( =x11-libs/qt-gui-4.7* )
-	)
-	systeminfo? (
-		sys-apps/util-linux
-		sys-fs/udev
-		x11-libs/libX11
-		x11-libs/libXrandr
-		=x11-libs/qt-dbus-4.7*
-		=x11-libs/qt-gui-4.7*
-		bluetooth? ( net-wireless/bluez )
-		networkmanager? ( net-misc/networkmanager )
-	)
-	versit? ( =x11-libs/qt-gui-4.7* )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	multimedia? (
-		sys-kernel/linux-headers
-		x11-proto/videoproto
-	)
-	systeminfo? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	connectivity? (
-		bluetooth? ( app-mobilephone/obexd )
-	)
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="changes-${PV}"
-
-pkg_setup() {
-	# figure out which modules to build
-	modules=
-	local m=( ${QT_MOBILITY_MODULES} )
-	for mod in ${m[@]#[+-]}; do
-		use ${mod} && modules+="${mod} "
-	done
-
-	if [[ -z ${modules} ]]; then
-		ewarn "At least one module must be selected for building, but you have selected none."
-		ewarn "The QtContacts module will be automatically enabled."
-		modules="contacts"
-	fi
-}
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# translations aren't really translated: disable them
-	sed -i -e '/SUBDIRS +=/s:translations::' qtmobility.pro || die
-
-	# fix automagic dependency on qt-opengl
-	if ! use opengl; then
-		sed -i -e '/QT +=/s:opengl::' src/multimedia/multimedia.pro || die
-	fi
-	# fix automagic dependency on qt-declarative
-	if ! use qml; then
-		sed -i -e '/SUBDIRS += declarative/d' plugins/plugins.pro || die
-	fi
-}
-
-src_configure() {
-	if use messaging; then
-		# tell configure/qmake where QMF is installed
-		export QMF_INCLUDEDIR="${EPREFIX}"/usr/include/qt4/qmfclient
-		export QMF_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/qt4
-	fi
-
-	# custom configure script
-	set -- ./configure -no-docs \
-		-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 tools || echo -no-tools) \
-		-modules "${modules}"
-	echo "$@"
-	"$@" || 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_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
-}