From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NX67f-0000sy-7D for garchives@archives.gentoo.org; Tue, 19 Jan 2010 04:55:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB406E0CB6; Tue, 19 Jan 2010 04:55:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 609A7E0CB6 for ; Tue, 19 Jan 2010 04:55:22 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 0AD771B40E1 for ; Tue, 19 Jan 2010 04:55:22 +0000 (UTC) Received: from abcd by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NX67d-0005n1-Ev for gentoo-commits@lists.gentoo.org; Tue, 19 Jan 2010 04:55:21 +0000 From: "Jonathan Callen (abcd)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, abcd@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kde-env: ChangeLog kde-env-4.3.4.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog kde-env-4.3.4.ebuild X-VCS-Directories: kde-base/kde-env X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen Content-Type: text/plain; charset=utf8 Message-Id: Sender: Jonathan Callen Date: Tue, 19 Jan 2010 04:55:21 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: cbbd626a-4e2b-40ea-9061-bee2c979ef0e X-Archives-Hash: 5b7bff3803aa36aa6a2e307fc3abbe0a abcd 10/01/19 04:55:21 Modified: ChangeLog kde-env-4.3.4.ebuild Log: Don't depend on kdelibs, use helpers to install, don't install unneeded= empty directories, add ~amd64-linux/~x86-linux keywords (Portage version: -svn/cvs/Linux i686) Revision Changes Path 1.61 kde-base/kde-env/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kde-env/C= hangeLog?rev=3D1.61&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kde-env/C= hangeLog?rev=3D1.61&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kde-env/C= hangeLog?r1=3D1.60&r2=3D1.61 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ChangeLog 13 Jan 2010 23:49:43 -0000 1.60 +++ ChangeLog 19 Jan 2010 04:55:20 -0000 1.61 @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kde-env # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.60 201= 0/01/13 23:49:43 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.61 201= 0/01/19 04:55:20 abcd Exp $ + + 19 Jan 2010; Jonathan Callen kde-env-4.3.4.ebuild: + Don't depend on kdelibs, use helpers to install, don't install unneede= d + empty directories, add ~amd64-linux/~x86-linux keywords =20 13 Jan 2010; Jeroen Roovers kde-env-4.3.3.ebuild: Stable for HPPA too. 1.4 kde-base/kde-env/kde-env-4.3.4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kde-env/k= de-env-4.3.4.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kde-env/k= de-env-4.3.4.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kde-env/k= de-env-4.3.4.ebuild?r1=3D1.3&r2=3D1.4 Index: kde-env-4.3.4.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.3.4.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kde-env-4.3.4.ebuild 23 Dec 2009 11:48:57 -0000 1.3 +++ kde-env-4.3.4.ebuild 19 Jan 2010 04:55:20 -0000 1.4 @@ -1,16 +1,17 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.3.4.ebuild= ,v 1.3 2009/12/23 11:48:57 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.3.4.ebuild= ,v 1.4 2010/01/19 04:55:20 abcd Exp $ =20 EAPI=3D"2" =20 +KDE_REQUIRED=3D"never" inherit kde4-base =20 DESCRIPTION=3D"Environment setting required for all KDE4 apps to run." HOMEPAGE=3D"http://kde.org" [[ ${PV} =3D *9999* ]] && ESVN_REPO_URI=3D"" || SRC_URI=3D"" =20 -KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-lin= ux ~x86-linux" LICENSE=3D"as-is" IUSE=3D"" =20 @@ -33,18 +34,13 @@ } =20 src_install() { - dodir /etc/env.d - dodir /etc/revdep-rebuild - dodir ${KDEDIR}/share/config - - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs+=3D":${EKDEDIR}/${_libdir}" - done - _libdirs=3D${_libdirs#:} - if use kdeprefix; then + # List all the multilib libdirs + local _libdir _libdirs + for _libdir in $(get_all_libdirs); do + _libdirs+=3D":${EKDEDIR}/${_libdir}" + done + _libdirs=3D${_libdirs#:} =20 # number goes down with version cat <<-EOF > "${T}/43kdepaths-${SLOT}" @@ -58,18 +54,20 @@ XDG_DATA_DIRS=3D"${EKDEDIR}/share" EOF doenvd "${T}/43kdepaths-${SLOT}" - cat <<-EOF > "${D%/}${EPREFIX}/etc/revdep-rebuild/50-kde-${SLOT}" + cat <<-EOF > "${T}/50-kde-${SLOT}" SEARCH_DIRS=3D"${EKDEDIR}/bin ${EKDEDIR}/lib*" EOF + insinto /etc/revdep-rebuild + doins "${T}/50-kde-${SLOT}" =20 # kdeglobals needed to make third party apps installed in /usr work - cat <<-EOF > "${D}/${EKDEDIR}/share/config/kdeglobals" + cat <<-EOF > "${T}/kdeglobals" [Directories][\$i] prefixes=3D${EPREFIX}/usr EOF - + insinto ${KDEDIR}/share/config + doins "${T}/kdeglobals" else - # Much simpler for the FHS compliant -kdeprefix install # number goes down with version cat <<-EOF > "${T}/43kdepaths" @@ -77,7 +75,6 @@ #KDE_IS_PRELINKED=3D1 EOF doenvd "${T}/43kdepaths" - fi } =20