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

Package-Manager: portage-2.1.2-r7

5 files changed, 29 insertions, 158 deletions

diff --git a/net-dialup/komport/ChangeLog b/net-dialup/komport/ChangeLog
index 219c3b05d75c..df51ee82575f 100644
--- a/net-dialup/komport/ChangeLog
+++ b/net-dialup/komport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/komport
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/komport/ChangeLog,v 1.7 2005/05/10 17:25:01 carlo Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/komport/ChangeLog,v 1.8 2007/02/05 11:01:00 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/komport-0.5.9-configure-arts.diff, komport-0.5.9.ebuild:
+  Update admin directory rather than patching configure to remove aRTs checks.
 
   10 May 2005; Carsten Lohrke <carlo@gentoo.org>
   +files/komport-0.5.9-configure-arts.diff, komport-0.5.9.ebuild:
diff --git a/net-dialup/komport/Manifest b/net-dialup/komport/Manifest
index 98d3172c6c38..8cb1fed7f900 100644
--- a/net-dialup/komport/Manifest
+++ b/net-dialup/komport/Manifest
@@ -1,30 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX komport-0.5.9-configure-arts.diff 3131 RMD160 f5b29a707a0f2513c56f018fe7f70eb482efc4b6 SHA1 54e6cc1f486f4207cd886519ce8f76f5f51a186e SHA256 c60f3e8ff7ffbeb66440784bb3428e441495ec448f68a79cca019e15fe0e4806
-MD5 50f57a07e20a6c00d06873c77ef3b9b0 files/komport-0.5.9-configure-arts.diff 3131
-RMD160 f5b29a707a0f2513c56f018fe7f70eb482efc4b6 files/komport-0.5.9-configure-arts.diff 3131
-SHA256 c60f3e8ff7ffbeb66440784bb3428e441495ec448f68a79cca019e15fe0e4806 files/komport-0.5.9-configure-arts.diff 3131
+DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
 DIST komport-0.5.9.tar.gz 506578 RMD160 be9497241272fbf6cde080221c3814d989c66515 SHA1 5a4dc426868fd26308d813b8a8cd7b41a0648326 SHA256 941a4acfbed5fc7c345d28e167afc16ec8d11e50f02d76344ebc340ddf802ce2
-EBUILD komport-0.5.9.ebuild 570 RMD160 7420346b00b5b3cca531fdec759d874ddf65b550 SHA1 9c569248056404215911b9bfbd0bb3418ff67a33 SHA256 08d453a44b88b23e2bbb3f00f8f1a0b234d44edd96452c362b97adcc26e8830d
-MD5 a74276984facbf9216623b146e62d765 komport-0.5.9.ebuild 570
-RMD160 7420346b00b5b3cca531fdec759d874ddf65b550 komport-0.5.9.ebuild 570
-SHA256 08d453a44b88b23e2bbb3f00f8f1a0b234d44edd96452c362b97adcc26e8830d komport-0.5.9.ebuild 570
-MISC ChangeLog 852 RMD160 d469fd727e420537855270c424a05efa3311588f SHA1 d4ec4d1a6e9fc37481594cc481ecc8d883d4e08f SHA256 be68eb74f1d6aba33db5d2af1001b33697a6d5c853ae1f221d61add44f66063d
-MD5 41bcf80b399b7ce487cec25f08d518b4 ChangeLog 852
-RMD160 d469fd727e420537855270c424a05efa3311588f ChangeLog 852
-SHA256 be68eb74f1d6aba33db5d2af1001b33697a6d5c853ae1f221d61add44f66063d ChangeLog 852
+EBUILD komport-0.5.9.ebuild 534 RMD160 850bee5868e0181b8b988e7c1f94a489d94b340d SHA1 91b056da468fad5b7cbccce55d14729c1fce180c SHA256 47887e275439b4b5183e2926a73a3d0d53d770536a4dbfc11ad0228085847500
+MD5 d0903b4283d6b0e04550ec85ef959111 komport-0.5.9.ebuild 534
+RMD160 850bee5868e0181b8b988e7c1f94a489d94b340d komport-0.5.9.ebuild 534
+SHA256 47887e275439b4b5183e2926a73a3d0d53d770536a4dbfc11ad0228085847500 komport-0.5.9.ebuild 534
+MISC ChangeLog 1055 RMD160 5fac67311feff146291fbc030ccdfe9d54cb631b SHA1 b6a5966e1afeedf264e3aa484a2158891583c18d SHA256 adfe25f59884d804266b89e66c91046bc9bb6b74f0c000f9d6ad8a918bbaba5f
+MD5 9b45a12aadb97f9d0c18cfa747e6053e ChangeLog 1055
+RMD160 5fac67311feff146291fbc030ccdfe9d54cb631b ChangeLog 1055
+SHA256 adfe25f59884d804266b89e66c91046bc9bb6b74f0c000f9d6ad8a918bbaba5f ChangeLog 1055
 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 aa00e232383c4be6af902e5f524da958 files/digest-komport-0.5.9 241
-RMD160 a9d9b8dd7526c981ef4715acda049bdc5cd3d626 files/digest-komport-0.5.9 241
-SHA256 3020bf71df7c3a1564b133940d29688531f193bbf3602e9450593d83d916abf3 files/digest-komport-0.5.9 241
+MD5 fb28208c41494157263a20d0ebe36f4b files/digest-komport-0.5.9 500
+RMD160 df99bf112ccb2bddbea8bff94f8b3c084d635642 files/digest-komport-0.5.9 500
+SHA256 623d67d2ca3f33b9d4be81c261532ef0efb2dee008ed712a6213f21ab7241c0e files/digest-komport-0.5.9 500
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFFPsJ3sf9c6kjmR8RArPBAJwJ4sjxftVd/SAaUXYqm26ovSFlsgCgpfKO
-OTFR/fX4CnbOeYE05mzAuA0=
-=2mO7
+iD8DBQFFxw51AiZjviIA2XgRAj15AJ47yAs4fSQ4i5VWFU2hDzRtLbQFXwCg8Acl
+w1lHvvirvyvhNoDywFcP3CI=
+=1+9U
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/komport/files/digest-komport-0.5.9 b/net-dialup/komport/files/digest-komport-0.5.9
index 7fb4096df2b5..8ffe6399fd05 100644
--- a/net-dialup/komport/files/digest-komport-0.5.9
+++ b/net-dialup/komport/files/digest-komport-0.5.9
@@ -1,3 +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 215bab736190d6150988bc39929a846d komport-0.5.9.tar.gz 506578
 RMD160 be9497241272fbf6cde080221c3814d989c66515 komport-0.5.9.tar.gz 506578
 SHA256 941a4acfbed5fc7c345d28e167afc16ec8d11e50f02d76344ebc340ddf802ce2 komport-0.5.9.tar.gz 506578
diff --git a/net-dialup/komport/files/komport-0.5.9-configure-arts.diff b/net-dialup/komport/files/komport-0.5.9-configure-arts.diff
deleted file mode 100644
index dbe168174a6f..000000000000
--- a/net-dialup/komport/files/komport-0.5.9-configure-arts.diff
+++ /dev/null
@@ -1,129 +0,0 @@
---- configure.orig	2005-05-10 01:45:51.000000000 +0200
-+++ configure	2005-05-10 01:47:38.000000000 +0200
-@@ -8270,126 +8270,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/net-dialup/komport/komport-0.5.9.ebuild b/net-dialup/komport/komport-0.5.9.ebuild
index 6284ee5dd0c6..374b96786279 100644
--- a/net-dialup/komport/komport-0.5.9.ebuild
+++ b/net-dialup/komport/komport-0.5.9.ebuild
@@ -1,12 +1,13 @@
-# 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/net-dialup/komport/komport-0.5.9.ebuild,v 1.8 2006/03/12 14:33:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/komport/komport-0.5.9.ebuild,v 1.9 2007/02/05 11:01:00 flameeyes Exp $
 
 inherit kde
 
 DESCRIPTION="Komport - Serial port communications and vt102 terminal emulator for KDE"
 HOMEPAGE="http://komport.sourceforge.net/"
-SRC_URI="mirror://sourceforge/komport/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -14,8 +15,3 @@ KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 need-kde 3
-
-src_unpack() {
-	kde_src_unpack
-	epatch "${FILESDIR}/${P}-configure-arts.diff"
-}