Fix bug #408201, patch by Ben Kohler <bkohler@gmail.com>. Add missing dep on qt-sql. Remove old and broken versions.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

5 files changed, 28 insertions, 108 deletions

diff --git a/app-editors/qxmledit/ChangeLog b/app-editors/qxmledit/ChangeLog
index 34639b3038ba..da95b2fc1bec 100644
--- a/app-editors/qxmledit/ChangeLog
+++ b/app-editors/qxmledit/ChangeLog
@@ -1,6 +1,14 @@
 # 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.22 2012/03/12 21:06:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/ChangeLog,v 1.23 2012/03/16 14:42:39 pesa Exp $
+
+*qxmledit-0.8.0-r1 (16 Mar 2012)
+
+  16 Mar 2012; Davide Pesavento <pesa@gentoo.org> +qxmledit-0.8.0-r1.ebuild,
+  -qxmledit-0.6.1.ebuild, -qxmledit-0.7.0.ebuild, -qxmledit-0.8.0.ebuild,
+  metadata.xml:
+  Fix bug #408201, patch by Ben Kohler <bkohler@gmail.com>. Add missing dep on
+  qt-sql. Remove old and broken versions.
 
 *qxmledit-0.8.0 (12 Mar 2012)
 
diff --git a/app-editors/qxmledit/metadata.xml b/app-editors/qxmledit/metadata.xml
index ac62b436f1a5..31f93e1d61d1 100644
--- a/app-editors/qxmledit/metadata.xml
+++ b/app-editors/qxmledit/metadata.xml
@@ -7,8 +7,7 @@
 		<name>Markos Chandras</name>
 	</maintainer>
 	<longdescription lang="en">
-		QXmlEdit is a simple XML editor written in qt4, it is not a complete and
+		QXmlEdit is a simple XML editor written in Qt4, it is not a complete and
 		full featured editor.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/app-editors/qxmledit/qxmledit-0.6.1.ebuild b/app-editors/qxmledit/qxmledit-0.6.1.ebuild
deleted file mode 100644
index 84e30735fda8..000000000000
--- a/app-editors/qxmledit/qxmledit-0.6.1.ebuild
+++ /dev/null
@@ -1,42 +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.6.1.ebuild,v 1.3 2012/02/14 17:14:28 tove Exp $
-
-EAPI="2"
-
-inherit 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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src/"
-
-DOCS="AUTHORS NEWS README TODO"
-DOCSDIR="${WORKDIR}/${P}/"
-
-src_prepare(){
-	# fix installation path
-	sed -i "/^INST_DIR/ s/\/opt\/${PN}/\/usr\/bin/" QXmlEdit.pro || \
-		die "failed to fix installation path"
-	# fix translations
-	sed -i "/^INST_DATA_DIR/ s/\/opt/\/usr\/share/" QXmlEdit.pro || \
-		die "failed to fix translations"
-	qt4-r2_src_prepare
-}
-
-src_install(){
-	qt4-r2_src_install
-	newicon "${S}"/images/icon.png ${PN}.png
-	make_desktop_entry QXmlEdit QXmlEdit ${PN} "Qt;Utility;TextEditor"
-}
diff --git a/app-editors/qxmledit/qxmledit-0.7.0.ebuild b/app-editors/qxmledit/qxmledit-0.8.0-r1.ebuild
index 9165152ae3bf..3d3ac0d9997e 100644
--- a/app-editors/qxmledit/qxmledit-0.7.0.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.8.0-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.7.0.ebuild,v 1.1 2012/02/08 18:38:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qxmledit/qxmledit-0.8.0-r1.ebuild,v 1.1 2012/03/16 14:42:39 pesa Exp $
 
 EAPI=4
 
-inherit multilib qt4-r2
+inherit multilib eutils qt4-r2
 
 MY_P="qxmledit-${PV}-src"
 
@@ -12,38 +12,42 @@ DESCRIPTION="Qt4 XML Editor"
 HOMEPAGE="http://code.google.com/p/qxmledit/"
 SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-xmlpatterns:4"
+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 TODO"
-DOCSDIR="${WORKDIR}/${P}/"
+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 installation path"
-	# fix installation path
+		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 installation path"
-	# fix widget library
+		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 || die "failed to fix library installation path"
+		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.0.ebuild b/app-editors/qxmledit/qxmledit-0.8.0.ebuild
deleted file mode 100644
index abc06a4237c3..000000000000
--- a/app-editors/qxmledit/qxmledit-0.8.0.ebuild
+++ /dev/null
@@ -1,49 +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.ebuild,v 1.1 2012/03/12 21:06:35 hwoarang Exp $
-
-EAPI=4
-
-inherit multilib 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="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-xmlpatterns:4"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS NEWS README TODO"
-DOCSDIR="${WORKDIR}/${P}/"
-
-src_prepare() {
-	# fix doc dir
-	sed -i "/^INST_DOC_DIR/ s|/opt/${PN}|/usr/share/doc/${PF}|" src/QXmlEdit.pro || \
-		die "failed to fix installation path"
-	# fix installation path
-	sed -i "/^INST_DIR/ s|/opt/${PN}|/usr/bin|" src/QXmlEdit.pro || \
-		die "failed to fix installation path"
-	# fix widget library
-	sed -i "/^INST_DIR/ s|/opt/${PN}|/usr/$(get_libdir)|" \
-		src/QXmlEditWidget.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"
-}