From 4593091e9a02f4799cdf9993837c59d0c3b1b50e Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Mon, 5 Feb 2007 10:26:34 +0000 Subject: Update admin directory rather than patching configure to disable aRTs checks. Package-Manager: portage-2.1.2-r7 --- x11-misc/karamba/ChangeLog | 9 +- x11-misc/karamba/Manifest | 35 +++++- x11-misc/karamba/files/digest-karamba-0.17-r1 | 1 - x11-misc/karamba/files/digest-karamba-0.17-r2 | 5 + .../files/karamba-0.17-configure-arts.patch | 139 --------------------- x11-misc/karamba/karamba-0.17-r1.ebuild | 35 ------ x11-misc/karamba/karamba-0.17-r2.ebuild | 26 ++-- 7 files changed, 49 insertions(+), 201 deletions(-) delete mode 100644 x11-misc/karamba/files/digest-karamba-0.17-r1 delete mode 100644 x11-misc/karamba/files/karamba-0.17-configure-arts.patch delete mode 100644 x11-misc/karamba/karamba-0.17-r1.ebuild (limited to 'x11-misc') diff --git a/x11-misc/karamba/ChangeLog b/x11-misc/karamba/ChangeLog index fa1f687f715c..9f92bfaf48d6 100644 --- a/x11-misc/karamba/ChangeLog +++ b/x11-misc/karamba/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/karamba -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/ChangeLog,v 1.19 2005/11/02 19:44:18 nelchael Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/ChangeLog,v 1.20 2007/02/05 10:26:34 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò + -files/karamba-0.17-configure-arts.patch, -karamba-0.17-r1.ebuild, + karamba-0.17-r2.ebuild: + Update admin directory rather than patching configure to disable aRTs checks. 02 Nov 2005; Krzysiek Pawlik karamba-0.17-r2.ebuild: Added missing eutils to inherit. diff --git a/x11-misc/karamba/Manifest b/x11-misc/karamba/Manifest index 5bcde2af70db..c43b62af79b5 100644 --- a/x11-misc/karamba/Manifest +++ b/x11-misc/karamba/Manifest @@ -1,8 +1,31 @@ -MD5 eccd0924e516acc2edac1b0139ffabab ChangeLog 2094 -MD5 2d6a37d1fe7a6d7ae2728d48fec2efd9 files/digest-karamba-0.17-r1 64 -MD5 2d6a37d1fe7a6d7ae2728d48fec2efd9 files/digest-karamba-0.17-r2 64 -MD5 be8ce78e013784421857511974eaab58 files/karamba-0.17-configure-arts.patch 3478 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX karamba-env 60 RMD160 50551150b711d312718f734fa74b41d0337be7d4 SHA1 29038d01c786ef8e7e0e2f4675b68547b58b6216 SHA256 9b6ab2da2957437d49f71d1514557e619bdff62fd8a70ec4a862059b8f481c3c MD5 dfffd46934fc1bbec91ae05eb8ec535b files/karamba-env 60 -MD5 4aa0a05d14d2d92818071d2d4120e5b0 karamba-0.17-r1.ebuild 970 -MD5 d98972d4dd3ba8942ad6c06556bdf654 karamba-0.17-r2.ebuild 1029 +RMD160 50551150b711d312718f734fa74b41d0337be7d4 files/karamba-env 60 +SHA256 9b6ab2da2957437d49f71d1514557e619bdff62fd8a70ec4a862059b8f481c3c files/karamba-env 60 +DIST karamba-0.17.tar.gz 592274 RMD160 d5ebd15946661ef8197ae974545c705a0826e795 SHA1 da32d6477015edb4124a30e94ef73c1e5bf82ceb SHA256 89afe4bc7f1cd668afa35dd0489a7cec7dbbf618a874b781e6ac962babdb1dba +DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153 +EBUILD karamba-0.17-r2.ebuild 861 RMD160 a6a578a2166120a844273963ad84825c8d1701c6 SHA1 4dd60f094e25b684ab595a3dba0fc155be42e470 SHA256 1a9f9f702e18f9974cc11a2c39e8963e0f383982d3b4491aa4f5039593061b48 +MD5 8fb3ceae68009a39c9e62c44c28062ac karamba-0.17-r2.ebuild 861 +RMD160 a6a578a2166120a844273963ad84825c8d1701c6 karamba-0.17-r2.ebuild 861 +SHA256 1a9f9f702e18f9974cc11a2c39e8963e0f383982d3b4491aa4f5039593061b48 karamba-0.17-r2.ebuild 861 +MISC ChangeLog 2324 RMD160 b7d4ae493112dbec4019310babdb3688cd20f6b9 SHA1 1b7d0463c2f6200e76ba14b4e519e75bbe91d6a2 SHA256 0729d190bf3bca9b3c6dc17232dd8daa4928754cfe2ad1a80cb6d884f1b1fef7 +MD5 03af6bfb17384ae3fa102e87d68b6fb2 ChangeLog 2324 +RMD160 b7d4ae493112dbec4019310babdb3688cd20f6b9 ChangeLog 2324 +SHA256 0729d190bf3bca9b3c6dc17232dd8daa4928754cfe2ad1a80cb6d884f1b1fef7 ChangeLog 2324 +MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231 +RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 metadata.xml 231 +SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a metadata.xml 231 +MD5 54cd1ebc2a1756a040a90fd9e0b032a9 files/digest-karamba-0.17-r2 497 +RMD160 98967822af4dd106c05dee5ecb7f88440ee5a567 files/digest-karamba-0.17-r2 497 +SHA256 e07b276fca920fbadc1fbbdf6df6f0e597eeee1778b63d5811cd87fad80fc901 files/digest-karamba-0.17-r2 497 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFFxwZhAiZjviIA2XgRAh6aAKDxrOANKvowyZtiMe29FZrTklj5/QCggM2/ +lwXQk88B3mlVMqlytR3MLqk= +=hSNB +-----END PGP SIGNATURE----- diff --git a/x11-misc/karamba/files/digest-karamba-0.17-r1 b/x11-misc/karamba/files/digest-karamba-0.17-r1 deleted file mode 100644 index 3b24fb743bb0..000000000000 --- a/x11-misc/karamba/files/digest-karamba-0.17-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c1e3f44149f838e86cc3d1e5962ca79f karamba-0.17.tar.gz 592274 diff --git a/x11-misc/karamba/files/digest-karamba-0.17-r2 b/x11-misc/karamba/files/digest-karamba-0.17-r2 index 3b24fb743bb0..61cbd58d9606 100644 --- a/x11-misc/karamba/files/digest-karamba-0.17-r2 +++ b/x11-misc/karamba/files/digest-karamba-0.17-r2 @@ -1 +1,6 @@ MD5 c1e3f44149f838e86cc3d1e5962ca79f karamba-0.17.tar.gz 592274 +RMD160 d5ebd15946661ef8197ae974545c705a0826e795 karamba-0.17.tar.gz 592274 +SHA256 89afe4bc7f1cd668afa35dd0489a7cec7dbbf618a874b781e6ac962babdb1dba karamba-0.17.tar.gz 592274 +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/x11-misc/karamba/files/karamba-0.17-configure-arts.patch b/x11-misc/karamba/files/karamba-0.17-configure-arts.patch deleted file mode 100644 index 25e2bdaa25c7..000000000000 --- a/x11-misc/karamba/files/karamba-0.17-configure-arts.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- configure.orig 2005-05-01 21:42:01.000000000 +0200 -+++ configure 2005-05-01 21:43:06.000000000 +0200 -@@ -23335,136 +23335,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/x11-misc/karamba/karamba-0.17-r1.ebuild b/x11-misc/karamba/karamba-0.17-r1.ebuild deleted file mode 100644 index 88f1d7a653cd..000000000000 --- a/x11-misc/karamba/karamba-0.17-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/karamba-0.17-r1.ebuild,v 1.15 2004/12/04 08:09:17 dragonheart Exp $ - -inherit kde - -DESCRIPTION="A KDE program that displays a lot of various information right on your desktop." -HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/" -SRC_URI="http://www.efd.lth.se/~d98hk/karamba/src/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ppc ~amd64" -IUSE="" - -DEPEND="kde-base/arts" - -need-kde 3.1 - -src_compile() { - local myconf="--enable-libsuffix=" - - kde_src_compile all -} - -src_install () { - emake DESTDIR=${D} install || die "install failed" - dodir /usr/share/doc/${P} /usr/share/karamba/themes /usr/share/karamba/bin - mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P} - keepdir /usr/share/karamba/themes/.keep - keepdir /usr/share/karamba/bin/.keep - - dodir /etc/env.d - cp ${FILESDIR}/karamba-env ${D}/etc/env.d/99karamba -} diff --git a/x11-misc/karamba/karamba-0.17-r2.ebuild b/x11-misc/karamba/karamba-0.17-r2.ebuild index 84209ec22119..0016cb0969cc 100644 --- a/x11-misc/karamba/karamba-0.17-r2.ebuild +++ b/x11-misc/karamba/karamba-0.17-r2.ebuild @@ -1,12 +1,13 @@ -# 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/x11-misc/karamba/karamba-0.17-r2.ebuild,v 1.4 2005/11/02 19:44:18 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/karamba/karamba-0.17-r2.ebuild,v 1.5 2007/02/05 10:26:34 flameeyes Exp $ inherit kde eutils DESCRIPTION="A KDE program that displays a lot of various information right on your desktop." HOMEPAGE="http://www.efd.lth.se/~d98hk/karamba/" -SRC_URI="http://www.efd.lth.se/~d98hk/karamba/src/${P}.tar.gz" +SRC_URI="http://www.efd.lth.se/~d98hk/karamba/src/${P}.tar.gz + mirror://gentoo/kde-admindir-3.5.5.tar.bz2" SLOT="0" LICENSE="GPL-2" @@ -15,24 +16,13 @@ IUSE="" need-kde 3.1 -src_unpack() { - kde_src_unpack - epatch ${FILESDIR}/${P}-configure-arts.patch -} - -src_compile() { - local myconf="--enable-libsuffix=" - - kde_src_compile all -} - src_install () { - emake DESTDIR=${D} install || die "install failed" + kde_src_install + dodir /usr/share/doc/${P} /usr/share/karamba/themes /usr/share/karamba/bin - mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P} + mv "${D}"/usr/share/doc/* "${D}/usr/share/doc/${P}" keepdir /usr/share/karamba/themes/.keep keepdir /usr/share/karamba/bin/.keep - dodir /etc/env.d - cp ${FILESDIR}/karamba-env ${D}/etc/env.d/99karamba + newenvd "${FILESDIR}/karamba-env" 99karamba } -- cgit v1.2.3-65-gdbad