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

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

4 files changed, 25 insertions, 17 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"