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

Package-Manager: portage-2.1.2-r7

5 files changed, 33 insertions, 155 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/Manifest b/kde-misc/kalbum/Manifest
index e90d3a68d7b3..deabe1010523 100644
--- a/kde-misc/kalbum/Manifest
+++ b/kde-misc/kalbum/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 52b6fe8cbf66198c58f68cb7c7b39794 ChangeLog 1320
-RMD160 6f06431eb6493f1cef659a6dd1ee2eaafb973e60 ChangeLog 1320
-SHA256 d2f55e5ef3a2aed4790c097c1d2bb5e4a871380f2f018d0dd1e6c08c8958481e ChangeLog 1320
-MD5 f501ad837ca304264a23f6ef285aae0c files/digest-kalbum-0.8.0 65
-RMD160 ab92021540398f4e848199e61e06c2c46f2bcea7 files/digest-kalbum-0.8.0 65
-SHA256 50b4c989a346ec657e1def6da77b313c281601fdc7192b5b77f0ff18ecbc6902 files/digest-kalbum-0.8.0 65
-MD5 cce166f5aa37a81de6a408c4a1661d2f files/kalbum-0.8.0-configure-arts.patch 3133
-RMD160 48f614ee13b8282d9cacc975145df631625cb004 files/kalbum-0.8.0-configure-arts.patch 3133
-SHA256 b0df2c4b6d68f3f81767f73a255c707621925743b5297756b31f45e41e2aba82 files/kalbum-0.8.0-configure-arts.patch 3133
-MD5 27939da5b5a49cae0527254551a46ca3 kalbum-0.8.0.ebuild 656
-RMD160 ba8a4de1fd11b5186d33950649268f7b1a2ab833 kalbum-0.8.0.ebuild 656
-SHA256 0973375e8130f43220ed3670da0858303fadaf9974874f3311dee5e913a40212 kalbum-0.8.0.ebuild 656
+DIST kalbum-0.8.0.tar.bz2 546729 RMD160 07a8f3f20b67eaa5cf095d48633c5cca27cdec13 SHA1 04c811f4dd0cd6701ecbc61f957e34401021b2db SHA256 82e0085bde8b3e0d197e0f82a757d56052f50a85cc7414b8e32e69613e7051bd
+DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
+EBUILD kalbum-0.8.0.ebuild 653 RMD160 9f36ef915c49cde3fd9f6c3e2c69261ad0b7a85e SHA1 daea05d48b97ad386b9feb3b68346a8324f83160 SHA256 fa4e88ba0d6a48c49b230706649864d71deceaed00dab9f9f0925b3e815016b2
+MD5 512b89efaba8e53158faf37b81161659 kalbum-0.8.0.ebuild 653
+RMD160 9f36ef915c49cde3fd9f6c3e2c69261ad0b7a85e kalbum-0.8.0.ebuild 653
+SHA256 fa4e88ba0d6a48c49b230706649864d71deceaed00dab9f9f0925b3e815016b2 kalbum-0.8.0.ebuild 653
+MISC ChangeLog 1522 RMD160 e5173dc7358055b69f64abe4df0a0cfd066f8dda SHA1 a573be2cd5c1240a0c1d2a723391b273db318ee3 SHA256 603c01aa6412b11b473cd98ae82523f67dc540090e559a47167fc961d5a505a8
+MD5 cefe8e715e781306aa1e5c8fe67eaeca ChangeLog 1522
+RMD160 e5173dc7358055b69f64abe4df0a0cfd066f8dda ChangeLog 1522
+SHA256 603c01aa6412b11b473cd98ae82523f67dc540090e559a47167fc961d5a505a8 ChangeLog 1522
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+MD5 9e5e6eced5ea1d2014a7777597686ce5 files/digest-kalbum-0.8.0 500
+RMD160 6328305a02700fc9a7747a65656f704110132067 files/digest-kalbum-0.8.0 500
+SHA256 8490fbf0e2fbc4afad36cb97900ff3a080342132d27eae4db89de70c9cd46edc files/digest-kalbum-0.8.0 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFEOaQzntT9W3vfTuoRAmrZAJ0ZLkaghgKVLWTmWRE0ewdV3NGmwwCfWRoz
-j+cdl0A1c0UeiqkxEiR4VeQ=
-=u42X
+iD8DBQFFxwqfAiZjviIA2XgRAogDAKCmZgEQOwklAw3l6jCgTm18Wv24XACgtD/t
+B163/mLUNffau8B1nAgrf24=
+=dIG/
 -----END PGP SIGNATURE-----
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
-
 }