Version bump. Remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

3 files changed, 15 insertions, 64 deletions

diff --git a/app-editors/qxmledit/ChangeLog b/app-editors/qxmledit/ChangeLog
index 23c3aff2c3d7..33992e005c73 100644
--- a/app-editors/qxmledit/ChangeLog
+++ b/app-editors/qxmledit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/qxmledit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/ChangeLog,v 1.45 2013/06/10 09:25:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/ChangeLog,v 1.46 2013/12/01 13:24:25 hwoarang Exp $
+
+*qxmledit-0.8.8.1 (01 Dec 2013)
+
+  01 Dec 2013; Markos Chandras <hwoarang@gentoo.org> +qxmledit-0.8.8.1.ebuild,
+  -qxmledit-0.8.3.1.ebuild, -qxmledit-0.8.4.ebuild:
+  Version bump. Remove old
 
   10 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> qxmledit-0.8.5.ebuild:
   Stable on x86, wrt bug #470320
diff --git a/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild b/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild
deleted file mode 100644
index f775242122b0..000000000000
--- a/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.3.1.ebuild,v 1.4 2013/03/02 19:22:03 hwoarang 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=">=dev-qt/qtcore-4.7:4
-	>=dev-qt/qtgui-4.7:4
-	>=dev-qt/qtsql-4.7:4
-	>=dev-qt/qtsvg-4.7:4
-	>=dev-qt/qtxmlpatterns-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{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix doc installation path"
-	# fix binary installation path
-	sed -i "/INST_DIR = / s|/opt/${PN}|/usr/bin|" \
-		src/QXmlEdit{,Widget}.pro src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix binary installation path"
-	# fix helper libraries installation path
-	sed -i "/INST_LIB_DIR = / s|/opt/${PN}|/usr/$(get_libdir)|" \
-		src/QXmlEdit{,Widget}.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 \
-		src/sessions/QXmlEditSessions.pro || \
-		die "failed to fix translations"
-	# fix include
-	sed -i "/INST_INCLUDE_DIR = / s|/opt|/usr/share|" src/QXmlEditWidget.pro \
-		|| die "failed to fix include directory"
-
-	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.4.ebuild b/app-editors/qxmledit/qxmledit-0.8.8.1.ebuild
index 02437f351c65..c93c2f3b1a1a 100644
--- a/app-editors/qxmledit/qxmledit-0.8.4.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.8.8.1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.4.ebuild,v 1.4 2013/03/19 10:33:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.8.1.ebuild,v 1.1 2013/12/01 13:24:25 hwoarang Exp $
 
 EAPI=5
 
-inherit multilib eutils qt4-r2
+inherit multilib eutils qt4-r2 versionator
 
-MY_P="qxmledit-${PV}-src"
+MY_PV="$(replace_version_separator 3 '-')"
+
+MY_P="qxmledit-${MY_PV}-src"
 
 DESCRIPTION="Qt4 XML Editor"
 HOMEPAGE="http://code.google.com/p/qxmledit/"
@@ -14,7 +16,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=">=dev-qt/qtcore-4.7:4
@@ -26,6 +28,8 @@ RDEPEND="${DEPEND}"
 
 DOCS="AUTHORS NEWS README ROADMAP TODO"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 src_prepare() {
 	# fix doc dir
 	sed -i "/INST_DOC_DIR = / s|/opt/${PN}|/usr/share/doc/${PF}|" \