Update admin directory rather than patching configure to disable aRTs checks.

(Portage version: 2.1.2-r7)

6 files changed, 20 insertions, 195 deletions

diff --git a/x11-misc/karamba/ChangeLog b/x11-misc/karamba/ChangeLog
index fa1f687f715c..9f92bfaf48d6 100644
--- a/x11-misc/karamba/ChangeLog
+++ b/x11-misc/karamba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/karamba
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/ChangeLog,v 1.19 2005/11/02 19:44:18 nelchael Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/ChangeLog,v 1.20 2007/02/05 10:26:34 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/karamba-0.17-configure-arts.patch, -karamba-0.17-r1.ebuild,
+  karamba-0.17-r2.ebuild:
+  Update admin directory rather than patching configure to disable aRTs checks.
 
   02 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> karamba-0.17-r2.ebuild:
   Added missing eutils to inherit.
diff --git a/x11-misc/karamba/files/digest-karamba-0.17-r1 b/x11-misc/karamba/files/digest-karamba-0.17-r1
deleted file mode 100644
index 3b24fb743bb0..000000000000
--- a/x11-misc/karamba/files/digest-karamba-0.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1e3f44149f838e86cc3d1e5962ca79f karamba-0.17.tar.gz 592274
diff --git a/x11-misc/karamba/files/digest-karamba-0.17-r2 b/x11-misc/karamba/files/digest-karamba-0.17-r2
index 3b24fb743bb0..61cbd58d9606 100644
--- a/x11-misc/karamba/files/digest-karamba-0.17-r2
+++ b/x11-misc/karamba/files/digest-karamba-0.17-r2
@@ -1 +1,6 @@
 MD5 c1e3f44149f838e86cc3d1e5962ca79f karamba-0.17.tar.gz 592274
+RMD160 d5ebd15946661ef8197ae974545c705a0826e795 karamba-0.17.tar.gz 592274
+SHA256 89afe4bc7f1cd668afa35dd0489a7cec7dbbf618a874b781e6ac962babdb1dba karamba-0.17.tar.gz 592274
+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
diff --git a/x11-misc/karamba/files/karamba-0.17-configure-arts.patch b/x11-misc/karamba/files/karamba-0.17-configure-arts.patch
deleted file mode 100644
index 25e2bdaa25c7..000000000000
--- a/x11-misc/karamba/files/karamba-0.17-configure-arts.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- configure.orig	2005-05-01 21:42:01.000000000 +0200
-+++ configure	2005-05-01 21:43:06.000000000 +0200
-@@ -23335,136 +23335,6 @@
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for mcopidl" >&5
--echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
--   if test -n "$MCOPIDL"; then
--        kde_cv_path="$MCOPIDL";
--   else
--        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
--
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--        kde_cv_path="NONE"
--	dirs="$kde_default_bindirs"
--	kde_save_IFS=$IFS
--	IFS=':'
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--        done
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/mcopidl"; then
--	    if test -n ""
--	    then
--              evalstr="$dir/mcopidl  2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/mcopidl"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/mcopidl"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly.
--" >&5
--echo "$as_me: error: The important program mcopidl was not found!
--Please check whether you installed aRts correctly.
--" >&2;}
--   { (exit 1); exit 1; }; }
--
--   else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
--      MCOPIDL=$kde_cv_path
--
--   fi
--
--
--   echo "$as_me:$LINENO: checking for artsc-config" >&5
--echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
--   if test -n "$ARTSCCONFIG"; then
--        kde_cv_path="$ARTSCCONFIG";
--   else
--        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
--
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--        kde_cv_path="NONE"
--	dirs="$kde_default_bindirs"
--	kde_save_IFS=$IFS
--	IFS=':'
--	for dir in $PATH; do
--	  dirs="$dirs $dir"
--        done
--	IFS=$kde_save_IFS
--
--        for dir in $dirs; do
--	  if test -x "$dir/artsc-config"; then
--	    if test -n ""
--	    then
--              evalstr="$dir/artsc-config  2>&1 "
--	      if eval $evalstr; then
--                kde_cv_path="$dir/artsc-config"
--                break
--	      fi
--            else
--		kde_cv_path="$dir/artsc-config"
--                break
--	    fi
--          fi
--        done
--
--        eval "kde_cv_path_$kde_cache=$kde_cv_path"
--
--
--fi
--
--
--      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
--
--   fi
--
--   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
--
--    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
--Please check whether you installed aRts correctly.
--" >&5
--echo "$as_me: error: The important program artsc-config was not found!
--Please check whether you installed aRts correctly.
--" >&2;}
--   { (exit 1); exit 1; }; }
--
--   else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
--      ARTSCCONFIG=$kde_cv_path
--
--   fi
- 
- 
-    echo "$as_me:$LINENO: checking for kde-config" >&5
diff --git a/x11-misc/karamba/karamba-0.17-r1.ebuild b/x11-misc/karamba/karamba-0.17-r1.ebuild
deleted file mode 100644
index 88f1d7a653cd..000000000000
--- a/x11-misc/karamba/karamba-0.17-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/karamba-0.17-r1.ebuild,v 1.15 2004/12/04 08:09:17 dragonheart Exp $
-
-inherit kde
-
-DESCRIPTION="A KDE program that displays a lot of various information right on your desktop."
-HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/"
-SRC_URI="http://www.efd.lth.se/~d98hk/karamba/src/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
-
-DEPEND="kde-base/arts"
-
-need-kde 3.1
-
-src_compile() {
-	local myconf="--enable-libsuffix="
-
-	kde_src_compile all
-}
-
-src_install () {
-	emake DESTDIR=${D} install || die "install failed"
-	dodir /usr/share/doc/${P} /usr/share/karamba/themes /usr/share/karamba/bin
-	mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P}
-	keepdir /usr/share/karamba/themes/.keep
-	keepdir /usr/share/karamba/bin/.keep
-
-	dodir /etc/env.d
-	cp ${FILESDIR}/karamba-env ${D}/etc/env.d/99karamba
-}
diff --git a/x11-misc/karamba/karamba-0.17-r2.ebuild b/x11-misc/karamba/karamba-0.17-r2.ebuild
index 84209ec22119..0016cb0969cc 100644
--- a/x11-misc/karamba/karamba-0.17-r2.ebuild
+++ b/x11-misc/karamba/karamba-0.17-r2.ebuild
@@ -1,12 +1,13 @@
-# 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/karamba/karamba-0.17-r2.ebuild,v 1.4 2005/11/02 19:44:18 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/karamba-0.17-r2.ebuild,v 1.5 2007/02/05 10:26:34 flameeyes Exp $
 
 inherit kde eutils
 
 DESCRIPTION="A KDE program that displays a lot of various information right on your desktop."
 HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/"
-SRC_URI="http://www.efd.lth.se/~d98hk/karamba/src/${P}.tar.gz"
+SRC_URI="http://www.efd.lth.se/~d98hk/karamba/src/${P}.tar.gz
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -15,24 +16,13 @@ IUSE=""
 
 need-kde 3.1
 
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-configure-arts.patch
-}
-
-src_compile() {
-	local myconf="--enable-libsuffix="
-
-	kde_src_compile all
-}
-
 src_install () {
-	emake DESTDIR=${D} install || die "install failed"
+	kde_src_install
+
 	dodir /usr/share/doc/${P} /usr/share/karamba/themes /usr/share/karamba/bin
-	mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P}
+	mv "${D}"/usr/share/doc/* "${D}/usr/share/doc/${P}"
 	keepdir /usr/share/karamba/themes/.keep
 	keepdir /usr/share/karamba/bin/.keep
 
-	dodir /etc/env.d
-	cp ${FILESDIR}/karamba-env ${D}/etc/env.d/99karamba
+	newenvd "${FILESDIR}/karamba-env" 99karamba
 }