Removed dependency on Qt metapackage and minor fixes to keep repoman happy

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

5 files changed, 32 insertions, 24 deletions

diff --git a/sci-geosciences/qlandkarte/ChangeLog b/sci-geosciences/qlandkarte/ChangeLog
index 6b9231716ea2..f5543f3168ad 100644
--- a/sci-geosciences/qlandkarte/ChangeLog
+++ b/sci-geosciences/qlandkarte/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/qlandkarte
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/ChangeLog,v 1.8 2008/12/24 12:54:17 hanno Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/ChangeLog,v 1.9 2009/09/30 16:44:49 ayoy Exp $
+
+  30 Sep 2009; Dominik Kapusta <ayoy@gentoo.org> qlandkarte-0.7.3.ebuild,
+  qlandkarte-0.7.4.ebuild:
+  Removed dependency on Qt metapackage and minor fixes to keep repoman happy
 
 *qlandkarte-0.7.4 (24 Dec 2008)
 
diff --git a/sci-geosciences/qlandkarte/Manifest b/sci-geosciences/qlandkarte/Manifest
index 711446a4bdd8..8eb53213ac97 100644
--- a/sci-geosciences/qlandkarte/Manifest
+++ b/sci-geosciences/qlandkarte/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST QLandkarte_0.7.3.tar.gz 2327171 RMD160 34e532fed41199aff94f88d9c3eedb8f67a4aef6 SHA1 8d4bd5729c827ed5e069d3f5030950ce735a7ec9 SHA256 a43b8f7ac793ea696d0908a187a872eaac6b934b5a435c906e520830dc70b51e
 DIST QLandkarte_final.tar.gz 2262229 RMD160 7461b170835dff7c71d3766c84dd21ec50935193 SHA1 a0bf7784e3de8d38b3b48d0f8fe1efd4b1f8afef SHA256 f483e8bc8e4dfb0ad387a2c6cfc45d5c5392b54508d6d4fd0c4e21221aff2674
-EBUILD qlandkarte-0.7.3.ebuild 708 RMD160 231c02dc82da0cb4eaa6fa6d3117797d11f400ee SHA1 c0e107b3708ea61c026e54eb5822ca8d9b7f65b1 SHA256 fd698816aafe80df695e06759989b812c6888bec90a3f41a3d22c508f373608e
-EBUILD qlandkarte-0.7.4.ebuild 946 RMD160 e8ac038d981ad3d4e1e2fca69173adfd24fe4a42 SHA1 6cdb779cc697fe0832b13f37008696cb5aa2b381 SHA256 e368b00369192c135d781a0321055c1f67af2216e9f0a9c2969ff4be2b1c02de
-MISC ChangeLog 1377 RMD160 8ee27e394165581ccd8330e9076ba780d61bf449 SHA1 6903f8254234021b3e7debbc9b5a70c567e29a2a SHA256 469fac7c05d43f98a5a64f76079340fa257376541ac3c315358c05eb7bbec581
+EBUILD qlandkarte-0.7.3.ebuild 699 RMD160 ed4ad35e48e7300af429b18fdedd317f8e34d552 SHA1 42ad6b03ed105b45af9038e916716c11e66b3ddc SHA256 ce36a12fd7fa4361df7963e1045e7a4b4101e4225b20b440fa2b79dab36b3a5d
+EBUILD qlandkarte-0.7.4.ebuild 937 RMD160 97fa48b14b225068045102b51fcb37e2c28b552e SHA1 0cff6bf4713232f154f0c1f872366712cdcdc369 SHA256 95dc7bc4716138847322fa543bfabf9cda91fd54a90c6c11feeff62d6a662050
+MISC ChangeLog 1555 RMD160 3b11d15e5e3ff9f2b769535c2dc74dbb4884622e SHA1 c43be360a26facf1e477847bf6d916d370b6c64d SHA256 1beef47a0938d27241c7bd5306f29c7a29aa7c082c5c8adada67c548fecf61c9
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAklSMPIACgkQr2QksT29OyBTugCfRHzdtIhNtj4u86h0cc9lJYfO
-jF8An01kqjJ/HxQWocmGvsB2kkOwjPru
-=3AHC
+iEYEARECAAYFAkrDiwkACgkQ+CZEqwt+F6aKlgCeKvb6raNidYnw5UUhEypNcgwO
+uNcAnjRi+Xs8b7DE7RfyhSsOmhQcxAMD
+=PyaW
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild b/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild
index 1e67fcb27a7c..c6ac7e8bd1c5 100644
--- a/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild
+++ b/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild,v 1.2 2008/07/27 01:20:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/qlandkarte-0.7.3.ebuild,v 1.3 2009/09/30 16:44:49 ayoy Exp $
 
 EAPI="1"
 
@@ -11,9 +11,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) =x11-libs/qt-4.3* )
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	sci-libs/proj
 	dev-libs/libusb"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/QLandkarte_${PV}"
 
diff --git a/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild b/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild
index 6733f63b204d..300b4ab8d3c5 100644
--- a/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild
+++ b/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild,v 1.1 2008/12/24 12:54:17 hanno Exp $
-
-inherit autotools eutils qt4
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/qlandkarte/qlandkarte-0.7.4.ebuild,v 1.2 2009/09/30 16:44:49 ayoy Exp $
 
 EAPI="1"
 
+inherit autotools eutils qt4
+
 DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS."
 HOMEPAGE="http://qlandkarte.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/QLandkarte_final.tar.gz"
@@ -13,9 +13,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) =x11-libs/qt-4.3* )
+DEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
 	sci-libs/proj
 	dev-libs/libusb"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/QLandkarte_final"
 
diff --git a/sci-geosciences/qlandkartegt/Manifest b/sci-geosciences/qlandkartegt/Manifest
index 12393ba5e4cb..361d6178c4f2 100644
--- a/sci-geosciences/qlandkartegt/Manifest
+++ b/sci-geosciences/qlandkartegt/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 DIST qlandkartegt-0.13.0.tar.gz 3447789 RMD160 f5b746e08eaa17c64156c9ef3bff2b150b13e1be SHA1 2661ac58f92b3d93e9b14e3dce28e5220420d569 SHA256 86716fb0b638687e1ecec1bf53beff1204f7023946b57d312b6120bbc6473175
 DIST qlandkartegt-0.14.1.tar.gz 3507604 RMD160 e6588ded09e1999740f05b14a6f1768912b6602f SHA1 954e6c99684ecb5898a7510490c4b6894ebbabe0 SHA256 291802626d44689fa35e6f84b2b9d09df2da82028999bb32e0765c1445334e02
 DIST qlandkartegt-0.15.1.tar.gz 3518089 RMD160 9aaa1c626925ad85235c132de366b253a9b7ff5f SHA1 ac9dee67fc8a030df79163f644ae4f2c1b799fcc SHA256 b6862400c11d7e753d335893f9d50c2f00a9aeebe495d553238f44979a98c09a
-EBUILD qlandkartegt-0.13.0.ebuild 649 RMD160 58618daa5d05a0659cb2b978dc834949cc776b4d SHA1 fd90e9c29fce6d1b343ff98b78608f501e3c860f SHA256 7c1d5dbfa029ed1b3ee8adc7efcc7cad2d1b1a8d800be549eefda7952ef7ec8b
-EBUILD qlandkartegt-0.14.1.ebuild 675 RMD160 02307414470a02ee6e000d24124d5f085b1fa71d SHA1 ed001ac9ecf4d0c1f3d059f069f22ade772a948b SHA256 468b31cc1bd892ecb3369e5117f8e4bc434b015cde1c533402d25189dc79defb
-EBUILD qlandkartegt-0.15.1.ebuild 695 RMD160 93bd784f710a56328e87204b0e5f1b348456d36b SHA1 cb2dc97a24f74a60a51aecafe087cccad9608a58 SHA256 28d7e0a99ba5ced9365fa5e7856842f98687316c715c0e142c0caf6652f0ddb8
-MISC ChangeLog 1266 RMD160 b7fefaeb0fdea02ade151fdc4a4314ba7dd86337 SHA1 966912a8fc87dc177313584c31f93eab290831b8 SHA256 7676a3058943964c8bf612d65873994c49b92b6dd9e53c000a3fc500bccae25d
+EBUILD qlandkartegt-0.13.0.ebuild 612 RMD160 0c88b9534436e5b7beaa989455ddc84b7972278d SHA1 7f42b8a60c2c60f7866960d37bd822c281491ad0 SHA256 d7cd3814fcdf474295307a9ffb62236ce4f8a3ff04729cf5082ccae58b1ca10a
+EBUILD qlandkartegt-0.14.1.ebuild 638 RMD160 3864e9bf4bdacc8931effc9c022fe029d632bf54 SHA1 960984f79e11dedfbcbaa103c38ba36136914ec6 SHA256 7835c25748514c69472ae050c75826e89f584a95d9c9b6f22d6a28b65b9bdf4b
+EBUILD qlandkartegt-0.15.1.ebuild 657 RMD160 4dd91c564370824daeae8007598bbe4f95611ac6 SHA1 ad442d1c1a01db784b128253c9dbc371b4b64721 SHA256 85e2b88ebbc7bf4e2254749abed59d35a880d7ab1b2b021bd0fdd03e180f2d1b
+MISC ChangeLog 1440 RMD160 aee4b9e7e6988d0f21c3627c14e17a3b3667a914 SHA1 3b21ffd16463d20bd048200470cfe9ccc77d98ff SHA256 be9d26e72647069e1998c836ab6129daebf65bd814775775494a4e8f63940fbd
 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq1IF0ACgkQr2QksT29OyB0wACgo5s49oDyC7eOBhYGqiEM6rfU
-ZlEAmgMszgJdENyZOa+z9NJDS0lkdDnD
-=wIvj
+iEYEARECAAYFAkrDjA4ACgkQ+CZEqwt+F6buvgCfYT9d2CnfhUF3oAPPwINUAVe5
+C9IAoJjGtQF351ZLNpsb5eJY8XB3SiMg
+=NeuG
 -----END PGP SIGNATURE-----