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

(Portage version: 2.1.2-r7)

4 files changed, 15 insertions, 139 deletions

diff --git a/kde-misc/kalbum/ChangeLog b/kde-misc/kalbum/ChangeLog
index acd2cb725237..a959cf8e27a7 100644
--- a/kde-misc/kalbum/ChangeLog
+++ b/kde-misc/kalbum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kalbum
-# Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kalbum/ChangeLog,v 1.4 2006/04/10 00:17:44 cryos Exp $
+# Copyright 2003-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kalbum/ChangeLog,v 1.5 2007/02/05 10:44:39 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kalbum-0.8.0-configure-arts.patch, kalbum-0.8.0.ebuild:
+  Update admin directory rather than patching configure to remove aRTs checks.
 
   10 Apr 2006; Marcus D. Hanwell <cryos@gentoo.org> kalbum-0.8.0.ebuild:
   Stable on amd64.
diff --git a/kde-misc/kalbum/files/digest-kalbum-0.8.0 b/kde-misc/kalbum/files/digest-kalbum-0.8.0
index d30777c71adf..9f02df1b6868 100644
--- a/kde-misc/kalbum/files/digest-kalbum-0.8.0
+++ b/kde-misc/kalbum/files/digest-kalbum-0.8.0
@@ -1 +1,6 @@
 MD5 1f698f91300ce48018ba3014d94de1ea kalbum-0.8.0.tar.bz2 546729
+RMD160 07a8f3f20b67eaa5cf095d48633c5cca27cdec13 kalbum-0.8.0.tar.bz2 546729
+SHA256 82e0085bde8b3e0d197e0f82a757d56052f50a85cc7414b8e32e69613e7051bd kalbum-0.8.0.tar.bz2 546729
+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/kde-misc/kalbum/files/kalbum-0.8.0-configure-arts.patch b/kde-misc/kalbum/files/kalbum-0.8.0-configure-arts.patch
deleted file mode 100644
index bb01bf0e4788..000000000000
--- a/kde-misc/kalbum/files/kalbum-0.8.0-configure-arts.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- configure.orig	2005-12-07 23:15:56.000000000 +0000
-+++ configure	2005-12-07 23:16:28.000000000 +0000
-@@ -8269,127 +8269,6 @@
- 
-    fi
- 
--        
--   echo $ac_n "checking for mcopidl""... $ac_c" 1>&6
--echo "configure:8275: checking for mcopidl" >&5
--   if test -n "$MCOPIDL"; then
--        kde_cv_path="$MCOPIDL";
--   else
--        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
--
--        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
--      
--    { echo "configure: error: The important program mcopidl was not found!
--Please check whether you installed KDE correctly.
--" 1>&2; exit 1; }
--
--   else
--      echo "$ac_t""$kde_cv_path" 1>&6
--      MCOPIDL=$kde_cv_path
--
--   fi
--
--        
--   echo $ac_n "checking for artsc-config""... $ac_c" 1>&6
--echo "configure:8335: checking for artsc-config" >&5
--   if test -n "$ARTSCCONFIG"; then
--        kde_cv_path="$ARTSCCONFIG";
--   else
--        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
--
--        if eval "test \"`echo '$''{'kde_cv_path_$kde_cache'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&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 "$ac_t""not found" 1>&6
--      
--    { echo "configure: error: The important program artsc-config was not found!
--Please check whether you installed KDE correctly.
--" 1>&2; exit 1; }
--
--   else
--      echo "$ac_t""$kde_cv_path" 1>&6
--      ARTSCCONFIG=$kde_cv_path
--
--   fi
--
--        
-    echo $ac_n "checking for kde-config""... $ac_c" 1>&6
- echo "configure:8395: checking for kde-config" >&5
-    if test -n "$KDECONFIG"; then
diff --git a/kde-misc/kalbum/kalbum-0.8.0.ebuild b/kde-misc/kalbum/kalbum-0.8.0.ebuild
index a5cdb3891276..bf5fc0740500 100644
--- a/kde-misc/kalbum/kalbum-0.8.0.ebuild
+++ b/kde-misc/kalbum/kalbum-0.8.0.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kalbum/kalbum-0.8.0.ebuild,v 1.3 2006/04/10 00:17:44 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kalbum/kalbum-0.8.0.ebuild,v 1.4 2007/02/05 10:44:39 flameeyes Exp $
 
 inherit kde
 
 IUSE=""
 DESCRIPTION="A photo album generator for KDE 3.x"
-SRC_URI="http://www.paldandy.com/kalbum/data/${P}/${P}.tar.bz2"
+SRC_URI="http://www.paldandy.com/kalbum/data/${P}/${P}.tar.bz2
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
 HOMEPAGE="http://www.paldandy.com/kalbum/"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc sparc x86"
 
 need-kde 3
 
-PATCHES="${FILESDIR}/${P}-configure-arts.patch"
-
 src_install() {
-
 	kde_src_install
 
 	insopts -o root -g root -m 644
 	insinto /usr/share/mimelnk/application/
 	doins ${FILESDIR}/${P}/x-kalbum.desktop
-
 }