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

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 7 insertions, 56 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/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