Make proper use of kde.eclass, properly allow to disable arts, mark -amd64 because of pointer to integer cast.

Package-Manager: portage-2.1.2-r7

8 files changed, 86 insertions, 104 deletions

diff --git a/x11-misc/kflog/ChangeLog b/x11-misc/kflog/ChangeLog
index d767323d68f6..3924dce60adf 100644
--- a/x11-misc/kflog/ChangeLog
+++ b/x11-misc/kflog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/kflog
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/kflog/ChangeLog,v 1.13 2005/08/25 05:04:51 smithj Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/kflog/ChangeLog,v 1.14 2007/02/05 10:19:02 flameeyes Exp $
+
+*kflog-2.1.1-r2 (05 Feb 2007)
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> kflog-2.1.1.ebuild,
+  -kflog-2.1.1-r1.ebuild, +kflog-2.1.1-r2.ebuild:
+  Make proper use of kde.eclass, properly allow to disable arts, mark -amd64
+  because of pointer to integer cast.
 
 *kflog-2.1.1-r1 (25 Aug 2005)
 
diff --git a/x11-misc/kflog/Manifest b/x11-misc/kflog/Manifest
index 310733c8f9e3..ad3dc13b28e0 100644
--- a/x11-misc/kflog/Manifest
+++ b/x11-misc/kflog/Manifest
@@ -1,16 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9fb9f9216c0ab7f27d9bb0882e01103f kflog-2.1.1.ebuild 1545
-MD5 023a6c2ee8796554cf53b0ed6a76ead4 ChangeLog 1535
+DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
+DIST kflog-2.1.1.tar.bz2 878288 RMD160 acfd1ade60db973e78ec2c4a63644b4fbc24b15b SHA1 1e24846a6e6bc7b3ac8b167d6e55558e1143a613 SHA256 00f295e856de906d72a1dbea825c4feeda10c77c69989ce15d841cb4262b5757
+EBUILD kflog-2.1.1-r2.ebuild 1257 RMD160 c13afccd7064301fcbe48a517b87edb6b60571aa SHA1 1ac1a5e9bd64c1292641c435f60f708771bc71c4 SHA256 7504bd52ed55ba531d90a27c57acd680c4c2dcf7a85cc436eb178460b2d0a49a
+MD5 6e40d2e6dc56d362d466ef10d673239f kflog-2.1.1-r2.ebuild 1257
+RMD160 c13afccd7064301fcbe48a517b87edb6b60571aa kflog-2.1.1-r2.ebuild 1257
+SHA256 7504bd52ed55ba531d90a27c57acd680c4c2dcf7a85cc436eb178460b2d0a49a kflog-2.1.1-r2.ebuild 1257
+EBUILD kflog-2.1.1.ebuild 1549 RMD160 5fbb86da03ca5653a5280a9b8a1fcf4d534c78c4 SHA1 89404ee7f3db1d38586de8a07ea9c128f6def129 SHA256 5c2043c481eae84cb7b3855b92b3a13f83387076af778ba48f10d5c2b8fa1a6f
+MD5 51c442e80da29fe8302cfd8ba1fae51c kflog-2.1.1.ebuild 1549
+RMD160 5fbb86da03ca5653a5280a9b8a1fcf4d534c78c4 kflog-2.1.1.ebuild 1549
+SHA256 5c2043c481eae84cb7b3855b92b3a13f83387076af778ba48f10d5c2b8fa1a6f kflog-2.1.1.ebuild 1549
+MISC ChangeLog 1808 RMD160 d8d9ef494f1379f9e0f5f75bbb0f67be519b6d00 SHA1 b355ef691968484e84d4200c03974fb8f7536957 SHA256 b89af1c86a5084d02960737e1a37a34d978b9fda4bc549df709de22fb58d07b6
+MD5 97d4a0b0ed0f998466f85fe8c6796d3a ChangeLog 1808
+RMD160 d8d9ef494f1379f9e0f5f75bbb0f67be519b6d00 ChangeLog 1808
+SHA256 b89af1c86a5084d02960737e1a37a34d978b9fda4bc549df709de22fb58d07b6 ChangeLog 1808
+MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a
 MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231
-MD5 118251c0be693c2e398d6780f265d004 kflog-2.1.1-r1.ebuild 2235
-MD5 98254d123c609c4e7d9d142e43da91c9 files/digest-kflog-2.1.1-r1 64
-MD5 98254d123c609c4e7d9d142e43da91c9 files/digest-kflog-2.1.1 64
+RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 metadata.xml 231
+SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a metadata.xml 231
+MD5 737aff715c6853d356e7b9d22cac9bae files/digest-kflog-2.1.1 238
+RMD160 d61aa43a7a4e4f903194096da5477405cca22362 files/digest-kflog-2.1.1 238
+SHA256 025838982bb6759ec5d06d381b7440b6ce90bcadbb6cac34c21439c0ad1998dc files/digest-kflog-2.1.1 238
+MD5 9134aa3f71dc3f414d7d0ed5542b4643 files/digest-kflog-2.1.1-r2 497
+RMD160 09f4d551021a78013d79d051e097f77ac13b6807 files/digest-kflog-2.1.1-r2 497
+SHA256 402041eff83890b51f39108444988e4957ac78f430f896a03d71f8dcfbec1f68 files/digest-kflog-2.1.1-r2 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFDDVGgl5AvwDPiUowRAl9oAKDAjVTUnwz/cQzSA0u0Axxg4nFzYQCglXmC
-b3pLuS+IBU4fqj5Do3YHqG8=
-=96Td
+iD8DBQFFxwShAiZjviIA2XgRAgjHAKDX1/2+qR8qa/F9/tiEe0DbpTrP+QCgltgK
+YR0xpY4b989EVjU1peJBj+0=
+=Vpsp
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/kflog/files/digest-kflog-2.1.1 b/x11-misc/kflog/files/digest-kflog-2.1.1
index f1310a6166b2..6d91b2dc6a71 100644
--- a/x11-misc/kflog/files/digest-kflog-2.1.1
+++ b/x11-misc/kflog/files/digest-kflog-2.1.1
@@ -1 +1,3 @@
 MD5 266b9f8d4551b9926d9848fb0f28139e kflog-2.1.1.tar.bz2 878288
+RMD160 acfd1ade60db973e78ec2c4a63644b4fbc24b15b kflog-2.1.1.tar.bz2 878288
+SHA256 00f295e856de906d72a1dbea825c4feeda10c77c69989ce15d841cb4262b5757 kflog-2.1.1.tar.bz2 878288
diff --git a/x11-misc/kflog/files/digest-kflog-2.1.1-r1 b/x11-misc/kflog/files/digest-kflog-2.1.1-r1
deleted file mode 100644
index f1310a6166b2..000000000000
--- a/x11-misc/kflog/files/digest-kflog-2.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 266b9f8d4551b9926d9848fb0f28139e kflog-2.1.1.tar.bz2 878288
diff --git a/x11-misc/kflog/files/digest-kflog-2.1.1-r2 b/x11-misc/kflog/files/digest-kflog-2.1.1-r2
new file mode 100644
index 000000000000..d4071cdbb356
--- /dev/null
+++ b/x11-misc/kflog/files/digest-kflog-2.1.1-r2
@@ -0,0 +1,6 @@
+MD5 0631502f50688142ae50da2cb136a422 kde-admindir-3.5.5.tar.bz2 187274
+RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed kde-admindir-3.5.5.tar.bz2 187274
+SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153 kde-admindir-3.5.5.tar.bz2 187274
+MD5 266b9f8d4551b9926d9848fb0f28139e kflog-2.1.1.tar.bz2 878288
+RMD160 acfd1ade60db973e78ec2c4a63644b4fbc24b15b kflog-2.1.1.tar.bz2 878288
+SHA256 00f295e856de906d72a1dbea825c4feeda10c77c69989ce15d841cb4262b5757 kflog-2.1.1.tar.bz2 878288
diff --git a/x11-misc/kflog/kflog-2.1.1-r1.ebuild b/x11-misc/kflog/kflog-2.1.1-r1.ebuild
deleted file mode 100644
index be1c67f9c69c..000000000000
--- a/x11-misc/kflog/kflog-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/kflog/kflog-2.1.1-r1.ebuild,v 1.1 2005/08/25 05:04:51 smithj Exp $
-
-inherit kde
-
-DESCRIPTION="A flight logger/analyser for KDE aimed at glider pilots"
-HOMEPAGE="http://www.kflog.org/kflog/"
-SRC_URI="http://www.kflog.org/download/src/${P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/gawk
-	sys-devel/gettext
-	sys-apps/grep
-	sys-devel/gcc
-	virtual/libc
-	sys-libs/zlib
-	arts? ( kde-base/arts )"
-
-RDEPEND="dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/jpeg
-	media-libs/libart_lgpl
-	media-libs/libmng
-	media-libs/libpng
-	media-libs/nas
-	sys-devel/gcc
-	virtual/libc
-	sys-libs/zlib
-	=x11-libs/qt-3*"
-
-need-kde 3
-
-src_unpack() {
-	unpack ${A}
-	if ! use arts; then
-		einfo "Removing arts checks..."
-		cd ${S}
-		sed -i -e '488,489d' -e '508,509d' acinclude.m4
-		einfo "Running autotools..."
-		aclocal
-		automake
-		autoconf
-		einfo "Fixing all Makefile.in..."
-		perl admin/am_edit \
-			po/Makefile.in \
-			doc/en/Makefile.in \
-			doc/Makefile.in \
-			kflog/pics/Makefile.in \
-			kflog/map-icons/small/Makefile.in \
-			kflog/map-icons/Makefile.in \
-			kflog/Makefile.in \
-			kflog/guicontrols/Makefile.in \
-			kflog/kfrfil/Makefile.in \
-			kflog/kfrgcs/Makefile.in \
-			kflog/kfrgmn/Makefile.in \
-			kflog/kfrxcu/Makefile.in \
-			kflog/kfrxsp/Makefile.in \
-			Makefile.in
-	fi
-}
-
-src_install() {
-	kde_src_install
-	rm -rf ${D}/usr/share/doc/HTML
-	chown -R root:users ${D}/usr/share/apps/kflog/mapdata
-	chmod -R ug+rw ${D}/usr/share/apps/kflog/mapdata
-}
-
-pkg_postinst() {
-	einfo "Note: Maps are not included. KFlog can download required data"
-	einfo "for you, or you may obtain map/airspace/airfield data at:"
-	einfo
-	einfo "http://maproom.kflog.org/"
-	einfo
-	einfo "and untar them in /usr/share/apps/kflog/mapdata"
-	einfo "Visiting http://www.kflog.org/ is generally a good idea."
-}
-
-pkg_postrm() {
-	einfo "Note: If you installed any maps, airspace or airfield data -"
-	einfo "DO NOT FORGET to remove it manually! (/usr/share/apps/kflog/mapdata"
-	einfo
-	einfo "Browsing though /usr/share/apps/kflog might be a good idea."
-}
diff --git a/x11-misc/kflog/kflog-2.1.1-r2.ebuild b/x11-misc/kflog/kflog-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..9383c14bb707
--- /dev/null
+++ b/x11-misc/kflog/kflog-2.1.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/kflog/kflog-2.1.1-r2.ebuild,v 1.1 2007/02/05 10:19:02 flameeyes Exp $
+inherit kde
+
+DESCRIPTION="A flight logger/analyser for KDE aimed at glider pilots"
+HOMEPAGE="http://www.kflog.org/kflog/"
+SRC_URI="http://www.kflog.org/download/src/${P}.tar.bz2
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+need-kde 3
+
+src_install() {
+	kde_src_install
+	rm -rf ${D}/usr/share/doc/HTML
+	chown -R root:users ${D}/usr/share/apps/kflog/mapdata
+	chmod -R ug+rw ${D}/usr/share/apps/kflog/mapdata
+}
+
+pkg_postinst() {
+	elog "Note: Maps are not included. KFlog can download required data"
+	elog "for you, or you may obtain map/airspace/airfield data at:"
+	elog
+	elog "http://maproom.kflog.org/"
+	elog
+	elog "and untar them in /usr/share/apps/kflog/mapdata"
+	elog "Visiting http://www.kflog.org/ is generally a good idea."
+}
+
+pkg_postrm() {
+	elog "Note: If you installed any maps, airspace or airfield data -"
+	elog "DO NOT FORGET to remove it manually! (/usr/share/apps/kflog/mapdata"
+	elog
+	elog "Browsing though /usr/share/apps/kflog might be a good idea."
+}
diff --git a/x11-misc/kflog/kflog-2.1.1.ebuild b/x11-misc/kflog/kflog-2.1.1.ebuild
index 4dc6afea8dc3..e9c3f490a33e 100644
--- a/x11-misc/kflog/kflog-2.1.1.ebuild
+++ b/x11-misc/kflog/kflog-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/kflog/kflog-2.1.1.ebuild,v 1.12 2005/07/28 21:11:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/kflog/kflog-2.1.1.ebuild,v 1.13 2007/02/05 10:19:02 flameeyes Exp $
 
 inherit kde
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kflog.org/kflog/"
 SRC_URI="http://www.kflog.org/download/src/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="-amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="sys-apps/gawk