Stable for x86/amd64, wrt to bug #417507, remove old

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 17 insertions, 74 deletions

diff --git a/app-editors/qxmledit/ChangeLog b/app-editors/qxmledit/ChangeLog
index 15bd4964ae6a..c61f5b25a50b 100644
--- a/app-editors/qxmledit/ChangeLog
+++ b/app-editors/qxmledit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/qxmledit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/ChangeLog,v 1.30 2012/04/19 10:22:23 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/ChangeLog,v 1.31 2012/05/25 17:07:16 ago Exp $
+
+  25 May 2012; Agostino Sarubbo <ago@gentoo.org> -qxmledit-0.8.0-r1.ebuild,
+  qxmledit-0.8.1.ebuild:
+  Stable for x86/amd64, wrt to bug #417507, remove old
 
   19 Apr 2012; Davide Pesavento <pesa@gentoo.org> -qxmledit-0.7.2.ebuild:
   Remove old.
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index 2c97c3def414..39ab56f5a891 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST qxmledit-0.8.0-src.tgz 9781643 RMD160 5a5a1ed2195fcc1804859383c245a3d53fe6df3f SHA1 5b8c7b0d300bcb6c90743059c107b39d011e311a SHA256 a445eb056a7a2e6763fcb8e8df669ca57f893383cb9e77adbc90fb76938e5b88
 DIST qxmledit-0.8.1-src.tgz 5439012 RMD160 fbe8830b115b9cd74d1d4a4d0268fdf79ac308b0 SHA1 e2226b7e5799f6196d9d14ba6de89a9d23c0e904 SHA256 0a9f526e1762f1b2c51821c3d2c543c9191bee7ec841219bd31108ea61c61d9a
-EBUILD qxmledit-0.8.0-r1.ebuild 1513 RMD160 1d74acd4ef9d4c3f68cec034b0459930227a41a3 SHA1 f4fa5ffafa7f6022128383b370b9f59a5e018b39 SHA256 4f1b15d7641ba5c93c2b9b81afe03d42cb6600974e81b40c28850e739b443f27
-EBUILD qxmledit-0.8.1.ebuild 1795 RMD160 546ef77f826bb7909d6de344becd831d75cd9c17 SHA1 591f9b8dc4065a16fd1d08da7e5eba5eb4ce2afa SHA256 2f20a1c01cc55a490f30da21b715425464c9ec2c329eefc869dce85b6bdd6678
-MISC ChangeLog 3937 RMD160 be4d0a2341620696400066ed1f0f4d7caf4c2df6 SHA1 28de6973eebf7f1ebba363ce920d985f82e2f0ba SHA256 235318ab1218919761dbf202c6163a8fc317337545351d0bae782d9f68599661
+EBUILD qxmledit-0.8.1.ebuild 1788 RMD160 1002cb521f8b35d090f651cdde5e13849edc4e2b SHA1 93349412f721c56ad9cdf76ec3ae0a6b7b5c36e7 SHA256 b21d1f01975597fe122c38ae12519ebcc9e9d760aa0131823c638f4e65acfde8
+MISC ChangeLog 4093 RMD160 6797d6b99692dad26309f712e01207ad77157036 SHA1 9585d3f09673a0e2c0a2bcdd3b7e72525180cc38 SHA256 352a1b3d1887a1a7ade05378a1f990f1237af9d68bee35cdac5c51eaaea0a766
 MISC metadata.xml 474 RMD160 bbc4351bd91dd4cf3ea14fab0c1a294ccabf6b9f SHA1 669ace052137a2ba954d4dd2f5b4ae21faf73d5e SHA256 51aa867868286ce5fb324da39d7606e758b7331d8c456cd9df0e9b8f74e42571
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPj+d4AAoJENXLsxwXqFxyrgIQAKOgw+UqUTp9kBpCTWtUoc8K
-PcQfdPTet10btc6oiPjQGiFgro/6a05PnLCa1QT+r0uU+RLY/4y+vQCgbmx1FmOd
-Ju9obnzYqc2p11C97TSAJugpNV2Ac6HOvOlMvtb3Dz7fkD3fiweMLwLhr/WkPhuk
-Ztvs7gcDusxBLiDU+8SsC/V1WIIgJD8DhHDGiYa/y5nCj7pFJtoNS4syj0kdO7Id
-EQqj7Z6iTsZD62TD/qJbXHd5Ja+dus3UQSTSCEioCyhFn7h7m6vmB3QaWghZCvKd
-9atxEhZ3NTqpd0mOHoZbj9pWeou1qqLw/2BWgqpwkwf6w3BRBEDUlTogmaRkyByv
-ylYJx6pugPpJ+rAxDim4QpbI5Xdj3iC2YAhSJm5FeW7LYIE5HrROuc8XcS5RNP3J
-rzeeiQB7RIfeBG0vXWYPKvd+E2K082/+Dm4puPoYHhap1AsZ7zCLd5W/g+bJ6IRw
-QhChWulatiPAbbYZ2cgZyGZq6p/3QGvnctCFSv9OIYNWgGoiA8sXrfz3JwD3DWmR
-U0quYAgRJV7+Fl+G2dB99ASG/0gHC3J4BR5iOgVd6VxZjW5mouKLvZEU//nbFTrw
-TKqPcnbogWsiBeirvP8YVKEpJwS7c7CcForfO26Hi6JQEb/8J30859K+RFQdJbOz
-y7dHfVl2Q/uHL7+kcqIk
-=lNY9
+iQEcBAEBCgAGBQJPv7xOAAoJEOTDgjZ80txddToIALEAXAQRuarYVdTuBCg6/r3B
+6AirZgv+Zy3k4WY/NKRgPZ0sXrfw5XL5v2Te7CBSiR1yUZbIsLqZVSSXBIZbYXPX
+PycNfrHsfNE8mf2twS8R4owfKGD7wLBVV2CLljVMARsWSo08t/hZwFyqNwuOrc9v
+51cVWxad3TbUdKkX/Uoz6MCCTqhFnTKf07O33RsvgRSN+VXhESJXYOeekSPNo0mj
+lPrwyCaGkklxxxvbgiywNO0tZRcUMiP5DjF29KjXPnXGXhyYAK6QR/qc5aAk98d2
+zOWb8e0+z6g4sWttHGvoHJeGv0q2ebtbrv5MIcf491a2osgVzSMULCu6uN4zI04=
+=fOmJ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/qxmledit/qxmledit-0.8.0-r1.ebuild b/app-editors/qxmledit/qxmledit-0.8.0-r1.ebuild
deleted file mode 100644
index 8db32f669074..000000000000
--- a/app-editors/qxmledit/qxmledit-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.0-r1.ebuild,v 1.3 2012/04/18 21:58:58 jdhore Exp $
-
-EAPI=4
-
-inherit multilib eutils qt4-r2
-
-MY_P="qxmledit-${PV}-src"
-
-DESCRIPTION="Qt4 XML Editor"
-HOMEPAGE="http://code.google.com/p/qxmledit/"
-SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND=">=x11-libs/qt-core-4.7:4
-	>=x11-libs/qt-gui-4.7:4
-	>=x11-libs/qt-sql-4.7:4
-	>=x11-libs/qt-svg-4.7:4
-	>=x11-libs/qt-xmlpatterns-4.7:4"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS NEWS README ROADMAP TODO"
-
-src_prepare() {
-	# fix doc dir
-	sed -i "/^INST_DOC_DIR/ s|/opt/${PN}|/usr/share/doc/${PF}|" src/QXmlEdit.pro || \
-		die "failed to fix doc installation path"
-	# fix binary installation path
-	sed -i "/^INST_DIR/ s|/opt/${PN}|/usr/bin|" src/QXmlEdit.pro || \
-		die "failed to fix binary installation path"
-	# fix helper libraries installation path
-	sed -i "/^INST_DIR/ s|/opt/${PN}|/usr/$(get_libdir)|" \
-		src/QXmlEditWidget.pro \
-		src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix library installation path"
-	# fix translations
-	sed -i "/^INST_DATA_DIR/ s|/opt|/usr/share|" src/QXmlEdit{,Widget}.pro || \
-		die "failed to fix translations"
-
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	newicon src/images/icon.png ${PN}.png
-	make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
-}
diff --git a/app-editors/qxmledit/qxmledit-0.8.1.ebuild b/app-editors/qxmledit/qxmledit-0.8.1.ebuild
index e5144aa776a3..ef2de7188f2b 100644
--- a/app-editors/qxmledit/qxmledit-0.8.1.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.1.ebuild,v 1.1 2012/04/10 12:05:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.1.ebuild,v 1.2 2012/05/25 17:07:16 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND=">=x11-libs/qt-core-4.7:4