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

(Portage version: 2.1.2-r7)

7 files changed, 59 insertions, 95 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/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