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

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

6 files changed, 44 insertions, 128 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/Manifest b/app-editors/qxmledit/Manifest
index 4f6d1771c60c..c783938f2239 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -2,31 +2,27 @@
 Hash: SHA512
 
 DIST QXmlEdit-0.4.9-sources.tgz 1177149 RMD160 2bf0ec2c87c1a7c3bfd2fcc6a7a52ed0e24dc0d4 SHA1 668e099a1f23ef21b2114eaa1da6810668e2bf58 SHA256 3a25d7b4e62d7f41787d41ed7c448fdc4689fff0aac1b90488d3dd7a3d97e7d2
-DIST qxmledit-0.6.1-src.tgz 8783111 RMD160 50a5ad34777f17271a2ea3825530ade7b6595158 SHA1 f9d3b39181205a73cf166b2e027b959874aad57b SHA256 8d51d45bc165d0491aad18dfa049eb0183ce27eb78636f220c0a78b77868aedc
-DIST qxmledit-0.7.0-src.tgz 8986963 RMD160 0aa40d5e141679124b574209c4a014d37b766b7d SHA1 df40993d68a6aa29b282d2ba39f7978ca4443023 SHA256 d06ea67a154df0e964aa82fca14127e60d1db4b4759891eb0443c2887aaf8b33
 DIST qxmledit-0.7.2-src.tgz 8987006 RMD160 03517caf51cd5cdd142993339c7ad9e5f151e1b7 SHA1 875e8efbb9ad3284d5d96600f7280eb14b32287d SHA256 72beac6994fd1fedb57148c05853cdaef8dde9f51a9706de900b00d7ac079b38
 DIST qxmledit-0.8.0-src.tgz 9781643 RMD160 5a5a1ed2195fcc1804859383c245a3d53fe6df3f SHA1 5b8c7b0d300bcb6c90743059c107b39d011e311a SHA256 a445eb056a7a2e6763fcb8e8df669ca57f893383cb9e77adbc90fb76938e5b88
 EBUILD qxmledit-0.4.9.ebuild 1287 RMD160 b78e69d2b21e0dc50c180bbd293343ca02a44761 SHA1 c3d5a6cab1b44d2e5150a7291557bf8030e7400e SHA256 b50c329b0dfc79a2d77f988e95f7860af8f86520ff34ff363ce4854c5a63b119
-EBUILD qxmledit-0.6.1.ebuild 1043 RMD160 f09746681e1216b5a2333e57fd7731820c9c43dc SHA1 5107d6eb9a53afbad58307df18beedfc7264d004 SHA256 7f9f990736ead92b64204691c9503f6ff8a602159dfe8ba37d8806bd52123c41
-EBUILD qxmledit-0.7.0.ebuild 1394 RMD160 550ab66740e21b33d4d761b236c1a62b56584b8c SHA1 02a82d9487e109a722a15e7678d9684bf9a3c45c SHA256 67e971362dec36df4135b488e90da11155af1e54a3f329acbe1a8b463d12f788
 EBUILD qxmledit-0.7.2.ebuild 1394 RMD160 e09f45596dffccf227dc27606cc3ec0cbeb3321d SHA1 e3c5b7374e66cb52275603639b8e7f4a9a9ae68a SHA256 a5b0072425c040a7b1a6b68a1605853b67a217ae035011cba9f54eb83e4ba86c
-EBUILD qxmledit-0.8.0.ebuild 1394 RMD160 9d480a1292fb313bfa89e1742d699d82cd7e2a76 SHA1 dd209b8cc17b216fd923682c5e0ca3c16c551736 SHA256 014ec6819e1d412ba2f9bedb193664ee5eddd62c04282b6ce2513d91576e33c2
-MISC ChangeLog 2885 RMD160 9300cd2e9e769629976570ef864ce8135d55d9e8 SHA1 4d8b2a808f3a3039cd6633cfcbdb6778d106c64a SHA256 0063b6034fbddcdc5d53086f24235e1ea09b6afc4ea67e8eda2a00ceb6d16f43
-MISC metadata.xml 402 RMD160 f56803be7c036d5ba6c1d423d885e5b8b06b232b SHA1 7683b509fb177db24febe14d75acbcaa70376f2d SHA256 04dec97aebcdbea2b4d82a3b5089ecd9605e66aa989b89b97e6a66b718840a87
+EBUILD qxmledit-0.8.0-r1.ebuild 1513 RMD160 a0ed68c5f94f5cecb060d3ce7ab10a3e1118fc16 SHA1 46daac211b4a4662d8d276eeae7dc70a5e17d730 SHA256 d5fbc22542e009abfef02edebd2dee39c411834c514a3f860b38ec5df0f39ac8
+MISC ChangeLog 3204 RMD160 c9caafd84b96ae529fda3a27c198afdcb87176d3 SHA1 1dac4f982b1043ce036c854b131856d9b19a5585 SHA256 b195be6b7ea248ef9de9eb109f6169a4e968dd4a38972b1237ff823b6950ab4b
+MISC metadata.xml 401 RMD160 a60b51a7f095246a34bc4bde116aa46f3b7076cb SHA1 a6809cd545629a0c9d833564ec3adbd1950fd85c SHA256 94975e9825953e6554ba08a3ecf67a937a90f3d2891a1068f32f68dd85a797b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPXmVDAAoJEPqDWhW0r/LCBwIQAKvAxf80wdwVozFBIv0HC6Vm
-OhBtL0beUjwU0nDIxn0JqmIxIZyjaCPcWD3dnNvAqO33OWuFDkRYAojvt4Q+2+rZ
-GPv2y6ibRzPNACUzW+Oy34d0vKz0bSdHorXqPLkDrCR/zQOgXNrS78NEsHG/exl8
-IqfDmoFcLSMp/ycbGKdKkOMEZjxempNLdmpBlZ4GGoZYIqeb/DP8x0T/BKz+H7IM
-YYMI6fvpKL2cF9V/IFMLwCcn2EkFHb16bUcEU6AXjEQ8bs4knyWj128wsxJIL93q
-c8e9bHxflPCZMDteNOp9IoT3d5KZaCPLGP7OS9SsJyZJqOR4kIeC7JCh30qFVb4H
-3NyimIm9IQmY1PlTyNS5+/ikJ2SZskNvACQEfyB39EOGqoptr/bdvjIpOOjj4BYJ
-Dvx3hTTriLnWsQ4eYst4gp+92o/mGZBsBLnAIv1M2evG4wJ5uzmLMIinTujV0HnT
-D2p6bixp0SMi4lTUsyz7cbGzVv7t5lxbPJPP1jV0tRHRujIASBhnMgU8vYjjGlQR
-cafjXPF/U4ToyWAfVbpuch347aGFyaZxX0pxGwsOHjfZiSCDHJlqpdlrH6+L4+WP
-7K28QRJnSBxWQ0V4ohxe4X+6OBGo5ORZrw3K6Un9jrOAq3yN+sOeSRPmEB0c5dn0
-3rbP30fUDVwxE0hMSeDA
-=W2hY
+iQIcBAEBCgAGBQJPY1FnAAoJENXLsxwXqFxyB6UP/01bI0tEilaLIAN0LUncVfRg
+W88fEfaCtS9KrbLSUSbvhBS+lF095TodbSmhWRGvjwRGEIgI4eAhIg7TsdUEVfft
+WQUKEL4MCM0khhYGV8W8GzmUgpaRE1mUvqxpzRlzuJI9qxFVRWkDcMQyNXmEBDvT
+ta0h4hPHYurq8Dw0WCzJNxRvvFHfxPssjfhwXa16kzGRLdTV04rozhM27CfbPNA8
+HOYdNqUGy6kn4SXVuCtSn2G+XovTNUt+gwwvbYxQ10znyV2c6EnXlIJgF9OUthpl
+Nj7pldTQOUL43i2Z5qRkUL1KW/3DV6oOIgQ68AlwdNt9geOwbI1MUu1mWrigPr19
+uZQBXH+Sit92boOdm6ItvBlvPWzHHDaKIticXsFnoCwpr1Lk1TEmhOklCi7e7gmY
+jQJptRDRVJTd9cDJwgzLR9ue2bwVm0B25uPLENHFHgJUlovfTAqpPABwhCPwAtzd
+DpD86Hki/s+GEzfk6FnmjzSModiGu2QBRqx8f+NghYTlU0BXjTnRmB940oltzTiW
+QYnMnALgIGujOnn5f+0Lqi3V6uHIlxBXitWSZWbWISLqInS8oaUXMoJpuMLuItZO
+T08Xrj+pCBHEVJwgIMElR+ggwyGKS36wrfAYjIHZsas9EisqziYhmAlOliqS5Hny
+He8C8BWol/2XZ7Gk4O1N
+=dWCz
 -----END PGP SIGNATURE-----
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"
-}