Update admindir instead of using the broken patch to disable arts support, fix dependencies thanks to Patrick Lauer in bug #153414.

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 23 insertions, 181 deletions

diff --git a/media-radio/ktrack/Manifest b/media-radio/ktrack/Manifest
index 2bc854965d98..43d761b6ce50 100644
--- a/media-radio/ktrack/Manifest
+++ b/media-radio/ktrack/Manifest
@@ -1,18 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 425961039b5647442e07f68e7a3b3c3e ChangeLog 784
-MD5 409250505400437d9d102ff24c417b22 files/digest-ktrack-0.3.0_rc1 69
-MD5 409250505400437d9d102ff24c417b22 files/digest-ktrack-0.3.0_rc1-r1 69
-MD5 9604c3cce649969af07f785dd42e1469 files/ktrack-artsd.patch 3569
+AUX ktrack-time_include_fix.diff 277 RMD160 802fa20469398cd2a8bb04df8867c88a6cd1e719 SHA1 6150104c266b3dea512063f6a5c2bcd35b88bcbc SHA256 2156390de5aa44dc15857c439d8e08a8e408d61b82b9bd801a33b05345b4c889
 MD5 e53455b9e5cb455a5391588ac18978f9 files/ktrack-time_include_fix.diff 277
-MD5 9b38a38f607d2cfafc8bddef72b53752 ktrack-0.3.0_rc1-r1.ebuild 777
-MD5 4ac7ac9f1d52c0494cdc6b426f85c676 ktrack-0.3.0_rc1.ebuild 661
+RMD160 802fa20469398cd2a8bb04df8867c88a6cd1e719 files/ktrack-time_include_fix.diff 277
+SHA256 2156390de5aa44dc15857c439d8e08a8e408d61b82b9bd801a33b05345b4c889 files/ktrack-time_include_fix.diff 277
+DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
+DIST ktrack-0.3.0-rc1.tar.bz2 913764 RMD160 d611cbee53b7f5d12bf3cb7b8a22cf23bdd3cd4b SHA1 7965a7193d92ac5c1c9068c894477462466ef144 SHA256 595e4314ae611eac55ad5add46ba4e5c881c29e40c8261bfd5f65df318d35740
+EBUILD ktrack-0.3.0_rc1-r1.ebuild 698 RMD160 56b90ca4f9c029ef7e597def9cd741e1d2641c42 SHA1 1bf165d2acf789dc4117a1def24b4d2b7996b3f1 SHA256 b19620b93a1a665f77a5d03c93806852ef5fa0338145e794f24d5630d8807713
+MD5 6339f8669d94425a0ca049c914b48c3a ktrack-0.3.0_rc1-r1.ebuild 698
+RMD160 56b90ca4f9c029ef7e597def9cd741e1d2641c42 ktrack-0.3.0_rc1-r1.ebuild 698
+SHA256 b19620b93a1a665f77a5d03c93806852ef5fa0338145e794f24d5630d8807713 ktrack-0.3.0_rc1-r1.ebuild 698
+MISC ChangeLog 1060 RMD160 cf0e7d818f863655b640194bc3e9928e875d21ed SHA1 be04e37d01b2933e9c44464a03eb450fd1f6a4a8 SHA256 5902570a74d6e56f5290fe9323bbbff2336add98f8c02b4e5d8c542f90b821b9
+MD5 17f8cf3cc919f74f0da3360a9047ef9e ChangeLog 1060
+RMD160 cf0e7d818f863655b640194bc3e9928e875d21ed ChangeLog 1060
+SHA256 5902570a74d6e56f5290fe9323bbbff2336add98f8c02b4e5d8c542f90b821b9 ChangeLog 1060
+MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
+MD5 d3327b3b4ba99f3c0af023a05ea131c9 files/digest-ktrack-0.3.0_rc1-r1 512
+RMD160 88b42f7bcbe6431dbcd46b4eb11f11b0312a25fd files/digest-ktrack-0.3.0_rc1-r1 512
+SHA256 de30a494b0e0e2c6f16c572251414e67917f32d6da599ce0c2324aede6d9c652 files/digest-ktrack-0.3.0_rc1-r1 512
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFDmtxrV3J2n04EauwRAlFfAKC6iehQYESmvmacTaaDqRiHfosBVgCfc+3q
-fXkLWbSAqxGma/i+2OWLc9Q=
-=obqI
+iD8DBQFFRdDdAiZjviIA2XgRAgjtAJ96bNKtV8NPpZeZFukqPTCcjYb+0wCfTv4g
+ZzTNZQBFQr2wlbon8k89B6Y=
+=qKnF
 -----END PGP SIGNATURE-----
diff --git a/media-radio/ktrack/files/digest-ktrack-0.3.0_rc1 b/media-radio/ktrack/files/digest-ktrack-0.3.0_rc1
deleted file mode 100644
index 1db5d098b84d..000000000000
--- a/media-radio/ktrack/files/digest-ktrack-0.3.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 032c914ab7316471505265e6a68d9da3 ktrack-0.3.0-rc1.tar.bz2 913764
diff --git a/media-radio/ktrack/files/ktrack-artsd.patch b/media-radio/ktrack/files/ktrack-artsd.patch
deleted file mode 100644
index 5fe5355f9a0b..000000000000
--- a/media-radio/ktrack/files/ktrack-artsd.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- configure.orig	2004-01-23 17:53:53.000000000 +0100
-+++ configure	2005-08-03 09:35:39.000000000 +0200
-@@ -25850,139 +25850,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
- echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-    if test -n "$KDECONFIG"; then
diff --git a/media-radio/ktrack/ktrack-0.3.0_rc1.ebuild b/media-radio/ktrack/ktrack-0.3.0_rc1.ebuild
deleted file mode 100644
index f428cdedcb80..000000000000
--- a/media-radio/ktrack/ktrack-0.3.0_rc1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ktrack/ktrack-0.3.0_rc1.ebuild,v 1.5 2005/02/16 05:19:51 killsoft Exp $
-
-inherit kde
-
-MY_P=${P/_r/-r}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Amateur radio satellite prediction software"
-HOMEPAGE="http://ktrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ktrack/${MY_P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="x11-misc/xplanet
-	media-libs/hamlib"
-need-kde 3
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-time_include_fix.diff || \
-		die "epatch failed"
-}