Drop all 0.2.0 versions, leaving qutim ~arch only.

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

7 files changed, 28 insertions, 268 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 1c31bea13bb5..71be68061d9c 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/qutim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.20 2012/05/04 06:22:14 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.21 2012/05/15 21:57:07 pesa Exp $
+
+  15 May 2012; Davide Pesavento <pesa@gentoo.org>
+  -files/fix_insecure_rpath.patch, -files/qutim-0.2.0-gold.patch,
+  -qutim-0.2.0-r3.ebuild, -qutim-0.2.0-r4.ebuild, metadata.xml:
+  Drop all 0.2.0 versions, leaving qutim ~arch only.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> qutim-0.3.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index d8674e631a00..aa54d8e9679e 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -1,9 +1,24 @@
-AUX fix_insecure_rpath.patch 1129 RMD160 e7c10a11ac11ec90eba6d25b6b84f0f4701f5ae1 SHA1 ac79bf92d96437273379db12bb928bd9cee5408d SHA256 cf74d7e20071d398f617faff7e7470b221f599cc0677ddb676ea57bc58a5d4ad
-AUX qutim-0.2.0-gold.patch 178 RMD160 85144ae8b7173ee7fe4680c278cd322a60dafaf8 SHA1 dec2f5a5bc028c96a56c26b61665f36568941007 SHA256 1fa929958b466b8f469f42479bb9b9a9203fb3d3b84f09eea2cd8e3e2cdedb66
-DIST qutim-0.2.0.tar.bz2 2536041 RMD160 59ab7bb364c0cb15deba96cc0c50471a3902f96c SHA1 b21399950252a100bd99840f6d6dc8093eaeb082 SHA256 272fba12d2fea5a550a504a3fb75ea5852e2fd086f0873079433d6361cfbc232
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST qutim-0.3.1.tar.bz2 12056208 RMD160 a33342c803125b38a180b88f0b2d131d84137ee7 SHA1 99ceb2cfb641c90b52ab0c33817989209093c6c2 SHA256 a85f2bbb1d8010ee5506b0e82185a21a950d2fa36f72373a192070859e4944e1
-EBUILD qutim-0.2.0-r3.ebuild 2890 RMD160 9c2e3375b2358d488e1c26ae1088482177cfea5e SHA1 3d6f17c90fb7e1124d9e87c5f42b4854338f61a1 SHA256 6ba6316aea2bf0341e64a0fa6f146c5e1d1cf51d5ca09f2061c0a77358e4a516
-EBUILD qutim-0.2.0-r4.ebuild 2919 RMD160 8d441c5d0f674a43454b79786ef6f61d2e05fa8f SHA1 bc66cc29826eaa2c8037eba276f0af8dc4ae2a58 SHA256 58d908372904124798d79f864c91e357625f0bf831e87f3ae1c26ff9f53f3252
 EBUILD qutim-0.3.1.ebuild 3558 RMD160 3f8f2713755d73c3711aede078f466f08b5c3e2b SHA1 e175094abb22780e1d7185f737923cc8f7401561 SHA256 a34b6e0c5add9be4e76c5d27db38be0185f3d26557cc44cacb04245b64df63ae
-MISC ChangeLog 3476 RMD160 466a0aa5b3acc666cb61caecdc995e19a506893e SHA1 167638381a940d3fa2e4a5c1a8a36de695ad01dc SHA256 a6f1b4516feb6ec5b4c8ddb121d77dda20e0687a778b8d80894cdbc381901d3d
-MISC metadata.xml 1611 RMD160 9f693f4856ce36c6cabe5c9c8c3308f253b48f75 SHA1 8e264555886ba4b8b9c7de26458edc0f3acbb7b4 SHA256 cedf2389a362677ee014b9da89a35a252034b8cff134448f8ed87e4a5c391b5d
+MISC ChangeLog 3708 RMD160 9e8e1792b83cd6a66d06871c4e79bee778a24386 SHA1 a6e6f30e02ab1d4aee7a0e18d74de39a45a32021 SHA256 68092ab082aa450b64cefd92e123840cd8fac6c60ad1468dc3a3d83f775cbf38
+MISC metadata.xml 1551 RMD160 380a668d5f5b9212e86fe6f14462edc14c2380d8 SHA1 b7daffe1dcbf71dedd832f21d12263b01552fed9 SHA256 0e6bb79714b57945c8857beece62e163be6f0e4cc335e361942b41a8e5adebc2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPstFCAAoJENXLsxwXqFxytjoP/i4sDBFodsBg5PKOocToqiHs
+dD7vHeABD0oWsAeJxuGzHCQ4LSqph4tcz2kjsgH7Kvc+Dr1F1w7w2UhxyU8cljie
+f4lRj2+jL1fv0Z0Zoy3nd6//tT05zbh7B1aup31yO7R05kPBLMxwoMX8kRBPYcTl
+j+hsC8HEPclDH33RIJigMU0PlZOP4gUcr4XYMil6d820WPnyALh4RiybCy/679K3
+VxblK5zf5YrmAi5boKsirQ5V6hgM2P8OP5P/n4mImrPa8cciMyI04DOa44tTF4wf
+JtV4wS2fDRj3ISuWgR9t6J/bKi/Hc5VB/UGiEHo8ccpNRaPcYf63DhlF4pvtxGNb
+vdt7N0opFnOK/TVbmHKN/k2NDfZsx2fXMJKG543vqKzcV/js/WfV33Lp758Tb+sy
+EoEDNI4N0wE8UZSaMlz2ppzH06M8Sn79K6Iy8+0w+vQfKFIKiuHNxRGe1TwKys/J
+Jzhq0pPRdPE/pSuEdfkycJJ/UDSrHdv69Q7kXfzmj2Iaf8zucqpT5es4k6QwLtEF
+b5x6aiC9Zi6tD7clrWQSKm/4RyGyOTIrS+ygWfi4FVQhrkYv5QV3mkjVjpQV/UPX
+xpTvW/xJrvZU6obMKoexEaDA9YfLCUgxxgH+wsQ2y/vldwKV+Bgn0QQGmZQe/YnI
+wufEgyD+1vnw+HPOhD54
+=XAdX
+-----END PGP SIGNATURE-----
diff --git a/net-im/qutim/files/fix_insecure_rpath.patch b/net-im/qutim/files/fix_insecure_rpath.patch
deleted file mode 100644
index 14c8273ecbbe..000000000000
--- a/net-im/qutim/files/fix_insecure_rpath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: qutim-0.2.0/CMakeLists.txt
-===================================================================
---- qutim-0.2.0.orig/CMakeLists.txt
-+++ qutim-0.2.0/CMakeLists.txt
-@@ -46,6 +46,9 @@ ADD_DEFINITIONS( -DQUTIM_SVN_REVISION=${
- SET (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- SET (CMAKE_BUILD_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+SET (CMAKE_SKIP_BUILD_RPATH  TRUE)
-+SET (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-+
- LIST (APPEND CMAKE_MODULE_PATH "cmake")
- LIST (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- SET (QT_USE_QTNETWORK true)
-Index: qutim-0.2.0/plugins/jabber/CMakeLists.txt
-===================================================================
---- qutim-0.2.0.orig/plugins/jabber/CMakeLists.txt
-+++ qutim-0.2.0/plugins/jabber/CMakeLists.txt
-@@ -11,6 +11,9 @@ file( GLOB_RECURSE QUTIM_UI src/*.ui )

- 

- SET (JABBER_LIBS "")

- SET (JABBER_INCLUDE_DIR "")

-+SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

-+SET (CMAKE_SKIP_BUILD_RPATH  TRUE)

-+SET (CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)

- 

- if( GLOOX_SHARED OR NOT GLOOX_PATH )

- 	SET( GLOOX_REQUIRED )

diff --git a/net-im/qutim/files/qutim-0.2.0-gold.patch b/net-im/qutim/files/qutim-0.2.0-gold.patch
deleted file mode 100644
index 9b96f70dad11..000000000000
--- a/net-im/qutim/files/qutim-0.2.0-gold.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -446,6 +446,7 @@
- 	${QT_LIBRARIES}
- 	${QT_QTMAIN_LIBRARY}
- 	${QUTIM_LIBS}
-+	-lX11
- 	)
- 
- SET (module_install_dir "${CMAKE_ROOT}/Modules")
\ No newline at end of file
diff --git a/net-im/qutim/metadata.xml b/net-im/qutim/metadata.xml
index 633e83fc94cf..f3096302fe07 100644
--- a/net-im/qutim/metadata.xml
+++ b/net-im/qutim/metadata.xml
@@ -21,6 +21,5 @@
 	<flag name="vkontakte">Enable vkontakte protocol support</flag>
 	<flag name="webkit">Enable Adium-like WebView plugin</flag>
 	<flag name="xscreensaver">Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events</flag>
-	<flag name="yandexnarod">Enable yandex.narod plugin</flag>
 </use>
 </pkgmetadata>
diff --git a/net-im/qutim/qutim-0.2.0-r3.ebuild b/net-im/qutim/qutim-0.2.0-r3.ebuild
deleted file mode 100644
index e71185493f55..000000000000
--- a/net-im/qutim/qutim-0.2.0-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.2.0-r3.ebuild,v 1.7 2011/04/08 18:26:23 hwoarang Exp $
-
-EAPI="2"
-LANGSLONG="bg_BG cs_CZ de_DE uk_UA"
-LANGS="ru"
-
-inherit eutils qt4-r2 cmake-utils
-MY_PN="${PN/im/IM}"
-
-DESCRIPTION="New Qt4-based Instant Messenger (ICQ)."
-HOMEPAGE="http://www.qutim.org"
-LICENSE="GPL-2"
-SRC_URI="http://qutim.org/uploads/src/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug histman icq irc xmpp gnutls mrim ssl vkontakte yandexnarod"
-
-DEPEND="x11-libs/qt-gui:4[debug?]
-	x11-libs/qt-webkit:4
-	|| ( media-libs/phonon x11-libs/qt-phonon )
-	xmpp? ( ssl? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/fix_insecure_rpath.patch
-)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	# fix translations directory
-	einfo "Fixing LINGUAS path"
-	sed -i "s/languages/\/usr\/share\/${PN}\/languages/" src/${PN}.cpp
-}
-
-src_compile() {
-	# build main executable
-	cmake-utils_src_compile
-	found=0
-	# build protocol support
-	if use xmpp; then
-		found=1
-		cd  "${S}"/plugins/jabber || die
-		mkdir build
-		cd build
-		cmake -C "${TMPDIR}"/gentoo_common_config.cmake \
-			  $(cmake-utils_use ssl OpenSSL) \
-			  $(cmake-utils_use gnutls GNUTLS) ../ || die
-		emake || die
-	fi
-	# build mrim
-	if use mrim; then
-		found=1
-		cd "${S}"/plugins/mrim || die
-		mkdir build
-		cd build
-		cmake -C "${TMPDIR}"/gentoo_common_config.cmake ../ || die
-		emake || die "failed to compile mrim plugin"
-	fi
-	# Qt4 based projects so I shall use eqmake4
-	cd "${S}"/plugins || die
-	for i in histman yandexnarod icq irc vkontakte;do
-		if use ${i}; then
-			found=1
-			cd "${i}"
-			einfo "now building ${i}-plugin"
-			eqmake4 ${i}.pro
-			emake || die "failed to compile ${i} plugin"
-			cd ..
-		fi
-	done
-
-}
-
-src_install(){
-	# not recommended by upstream and probably broken
-	#cmake-utils_src_install
-	dobin "${WORKDIR}/${P}_build/${PN}" || die
-
-	cd "${S}"/plugins || die
-	insinto "/usr/$(get_libdir)/qutim"
-	[[ $found -eq 1 ]] && doins $(find . -type f -executable -iname "*.so")
-	doicon "${S}"/icons/${PN}_64.png || die "Failed to install icon"
-	make_desktop_entry ${PN} ${MY_PN} ${PN}_64 \
-	"Network;InstantMessaging;Qt" || die "make_desktop_entry failed"
-
-	#install linguas
-	for X in ${LANGSLONG}; do
-		for Z in ${LINGUAS}; do
-			if [[ ${X%_*} == ${Z} ]]; then
-				einfo "Installing ${Z} translation files"
-				insinto /usr/share/${PN}/languages/${X}/
-				doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation"
-			fi
-		done
-	done
-	for X in ${LANGS}; do
-		for Z in ${LINGUAS}; do
-			if [[ ${X} == ${Z} ]]; then
-				einfo "Installing ${Z} translation files"
-				insinto /usr/share/${PN}/languages/${X}/
-				doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation"
-			fi
-		done
-	done
-
-}
diff --git a/net-im/qutim/qutim-0.2.0-r4.ebuild b/net-im/qutim/qutim-0.2.0-r4.ebuild
deleted file mode 100644
index 1a57052e3870..000000000000
--- a/net-im/qutim/qutim-0.2.0-r4.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.2.0-r4.ebuild,v 1.1 2012/03/16 11:58:25 johu Exp $
-
-EAPI="2"
-LANGSLONG="bg_BG cs_CZ de_DE uk_UA"
-LANGS="ru"
-
-inherit eutils qt4-r2 cmake-utils
-MY_PN="${PN/im/IM}"
-
-DESCRIPTION="New Qt4-based Instant Messenger (ICQ)."
-HOMEPAGE="http://www.qutim.org"
-LICENSE="GPL-2"
-SRC_URI="http://qutim.org/uploads/src/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug histman icq irc xmpp gnutls mrim ssl vkontakte yandexnarod"
-
-DEPEND="x11-libs/qt-gui:4[debug?]
-	x11-libs/qt-webkit:4
-	|| ( media-libs/phonon x11-libs/qt-phonon )
-	xmpp? ( ssl? ( dev-libs/openssl )
-		gnutls? ( net-libs/gnutls ) )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/fix_insecure_rpath.patch
-	"${FILESDIR}"/${P}-gold.patch
-)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	# fix translations directory
-	einfo "Fixing LINGUAS path"
-	sed -i "s/languages/\/usr\/share\/${PN}\/languages/" src/${PN}.cpp
-}
-
-src_compile() {
-	# build main executable
-	cmake-utils_src_compile
-	found=0
-	# build protocol support
-	if use xmpp; then
-		found=1
-		cd  "${S}"/plugins/jabber || die
-		mkdir build
-		cd build
-		cmake -C "${TMPDIR}"/gentoo_common_config.cmake \
-			  $(cmake-utils_use ssl OpenSSL) \
-			  $(cmake-utils_use gnutls GNUTLS) ../ || die
-		emake || die
-	fi
-	# build mrim
-	if use mrim; then
-		found=1
-		cd "${S}"/plugins/mrim || die
-		mkdir build
-		cd build
-		cmake -C "${TMPDIR}"/gentoo_common_config.cmake ../ || die
-		emake || die "failed to compile mrim plugin"
-	fi
-	# Qt4 based projects so I shall use eqmake4
-	cd "${S}"/plugins || die
-	for i in histman yandexnarod icq irc vkontakte;do
-		if use ${i}; then
-			found=1
-			cd "${i}"
-			einfo "now building ${i}-plugin"
-			eqmake4 ${i}.pro
-			emake || die "failed to compile ${i} plugin"
-			cd ..
-		fi
-	done
-
-}
-
-src_install(){
-	# not recommended by upstream and probably broken
-	#cmake-utils_src_install
-	dobin "${WORKDIR}/${P}_build/${PN}" || die
-
-	cd "${S}"/plugins || die
-	insinto "/usr/$(get_libdir)/qutim"
-	[[ $found -eq 1 ]] && doins $(find . -type f -executable -iname "*.so")
-	doicon "${S}"/icons/${PN}_64.png || die "Failed to install icon"
-	make_desktop_entry ${PN} ${MY_PN} ${PN}_64 \
-	"Network;InstantMessaging;Qt" || die "make_desktop_entry failed"
-
-	#install linguas
-	for X in ${LANGSLONG}; do
-		for Z in ${LINGUAS}; do
-			if [[ ${X%_*} == ${Z} ]]; then
-				einfo "Installing ${Z} translation files"
-				insinto /usr/share/${PN}/languages/${X}/
-				doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation"
-			fi
-		done
-	done
-	for X in ${LANGS}; do
-		for Z in ${LINGUAS}; do
-			if [[ ${X} == ${Z} ]]; then
-				einfo "Installing ${Z} translation files"
-				insinto /usr/share/${PN}/languages/${X}/
-				doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation"
-			fi
-		done
-	done
-
-}