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

(Portage version: 2.1.2-r7)

6 files changed, 16 insertions, 172 deletions

diff --git a/app-cdr/kcdlabel/ChangeLog b/app-cdr/kcdlabel/ChangeLog
index a19ec7e500fd..075c25a5229b 100644
--- a/app-cdr/kcdlabel/ChangeLog
+++ b/app-cdr/kcdlabel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/kcdlabel
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdlabel/ChangeLog,v 1.19 2005/08/04 08:06:43 blubb Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdlabel/ChangeLog,v 1.20 2007/02/05 10:33:44 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kcdlabel-2.12-configure-arts.patch, -kcdlabel-2.12.ebuild,
+  kcdlabel-2.12-r1.ebuild:
+  Update admin directory rather than patching configure to remove aRTs checks.
 
   04 Aug 2005; Simon Stelling <blubb@gentoo.org> kcdlabel-2.12-r1.ebuild:
   stable on amd64
diff --git a/app-cdr/kcdlabel/files/digest-kcdlabel-2.12 b/app-cdr/kcdlabel/files/digest-kcdlabel-2.12
deleted file mode 100644
index c22ade6d785a..000000000000
--- a/app-cdr/kcdlabel/files/digest-kcdlabel-2.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1a3f875fa3c6005db1fc7da47b13020 kcdlabel-2.12-KDE3.tar.gz 747046
diff --git a/app-cdr/kcdlabel/files/digest-kcdlabel-2.12-r1 b/app-cdr/kcdlabel/files/digest-kcdlabel-2.12-r1
index c22ade6d785a..bb1a1a117bda 100644
--- a/app-cdr/kcdlabel/files/digest-kcdlabel-2.12-r1
+++ b/app-cdr/kcdlabel/files/digest-kcdlabel-2.12-r1
@@ -1 +1,6 @@
 MD5 b1a3f875fa3c6005db1fc7da47b13020 kcdlabel-2.12-KDE3.tar.gz 747046
+RMD160 3480c6d2a931cb2cf0424c1037cadf67d3501cb5 kcdlabel-2.12-KDE3.tar.gz 747046
+SHA256 9a788a20b1cb3ab6b089aa556be61d48e81af320e8428c510cccb0dd8c4c3b60 kcdlabel-2.12-KDE3.tar.gz 747046
+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/app-cdr/kcdlabel/files/kcdlabel-2.12-configure-arts.patch b/app-cdr/kcdlabel/files/kcdlabel-2.12-configure-arts.patch
deleted file mode 100644
index 2f857a224ece..000000000000
--- a/app-cdr/kcdlabel/files/kcdlabel-2.12-configure-arts.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- configure.orig	2005-05-01 21:50:52.000000000 +0200
-+++ configure	2005-05-01 21:54:04.000000000 +0200
-@@ -23218,136 +23218,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/app-cdr/kcdlabel/kcdlabel-2.12-r1.ebuild b/app-cdr/kcdlabel/kcdlabel-2.12-r1.ebuild
index 88407c047940..dc1935bd3ce5 100644
--- a/app-cdr/kcdlabel/kcdlabel-2.12-r1.ebuild
+++ b/app-cdr/kcdlabel/kcdlabel-2.12-r1.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/app-cdr/kcdlabel/kcdlabel-2.12-r1.ebuild,v 1.5 2005/08/04 08:06:43 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdlabel/kcdlabel-2.12-r1.ebuild,v 1.6 2007/02/05 10:33:44 flameeyes Exp $
 
 inherit flag-o-matic kde eutils
 
@@ -8,7 +8,8 @@ S=${WORKDIR}/${P}-KDE3
 
 DESCRIPTION="cd label printing tool for kde"
 HOMEPAGE="http://kcdlabel.sourceforge.net/"
-SRC_URI="http://kcdlabel.sourceforge.net/download/${P}-KDE3.tar.gz"
+SRC_URI="http://kcdlabel.sourceforge.net/download/${P}-KDE3.tar.gz
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -17,10 +18,6 @@ IUSE=""
 
 need-kde 3
 
-src_unpack(){
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-configure-arts.patch
-}
 src_compile(){
 	append-flags -fpermissive
 	kde_src_compile all
diff --git a/app-cdr/kcdlabel/kcdlabel-2.12.ebuild b/app-cdr/kcdlabel/kcdlabel-2.12.ebuild
deleted file mode 100644
index d7bb95997cd4..000000000000
--- a/app-cdr/kcdlabel/kcdlabel-2.12.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdlabel/kcdlabel-2.12.ebuild,v 1.14 2007/01/29 03:03:50 mr_bones_ Exp $
-
-inherit flag-o-matic kde
-
-S=${WORKDIR}/${P}-KDE3
-
-DESCRIPTION="cd label printing tool for kde"
-HOMEPAGE="http://kcdlabel.sourceforge.net/"
-SRC_URI="http://kcdlabel.sourceforge.net/download/${P}-KDE3.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-need-kde 3
-
-src_compile(){
-	append-flags -fpermissive
-	kde_src_compile all
-}