diff options
author | Jonathan Callen <jcallen@gentoo.org> | 2010-02-01 01:14:00 +0000 |
---|---|---|
committer | Jonathan Callen <jcallen@gentoo.org> | 2010-02-01 01:14:00 +0000 |
commit | e4d276af4f4c4257021fe3c9f9e520e51725d0bb (patch) | |
tree | af5260a39cf95e1a1f6991700e0af4fe0326261a /kde-base | |
parent | Fixup disabling tests for 5.1 and also gcc-version usage. (diff) | |
download | historical-e4d276af4f4c4257021fe3c9f9e520e51725d0bb.tar.gz historical-e4d276af4f4c4257021fe3c9f9e520e51725d0bb.tar.bz2 historical-e4d276af4f4c4257021fe3c9f9e520e51725d0bb.zip |
Remove dep on cmake, port changes from kde overlay
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kde-env/ChangeLog | 5 | ||||
-rw-r--r-- | kde-base/kde-env/Manifest | 10 | ||||
-rw-r--r-- | kde-base/kde-env/kde-env-4.3.5-r1.ebuild | 44 |
3 files changed, 22 insertions, 37 deletions
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog index 438603bd5206..141e9b6a8666 100644 --- a/kde-base/kde-env/ChangeLog +++ b/kde-base/kde-env/ChangeLog @@ -1,6 +1,9 @@ # 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.64 2010/01/30 03:33:33 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.65 2010/02/01 01:14:00 abcd Exp $ + + 01 Feb 2010; Jonathan Callen <abcd@gentoo.org> kde-env-4.3.5-r1.ebuild: + Remove dep on cmake, port changes from kde overlay *kde-env-4.3.5-r1 (30 Jan 2010) *kde-env-4.3.4-r1 (30 Jan 2010) diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest index fb983ced6ac2..075fc228420f 100644 --- a/kde-base/kde-env/Manifest +++ b/kde-base/kde-env/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 EBUILD kde-env-4.3.3.ebuild 1872 RMD160 bc8a6cbfe573a1de8cdc297daa24b4b3c251e83e SHA1 e1de56e6dc678ee3ccca308cbdbbc6509168e84b SHA256 af67a4f163a628015d4f5e3a183254aa74f2869c7f133b45005468e8b56cc716 EBUILD kde-env-4.3.4-r1.ebuild 1941 RMD160 d6bfa29af3b086ab8606327ab1913fce8c99731f SHA1 8e0a8ad0f5a60ea2345589a9631f3a4a9c06b332 SHA256 8f55d23c546324cc34a28c4edd58409384628c4cd067fff056d6269f47be3efb -EBUILD kde-env-4.3.5-r1.ebuild 1941 RMD160 c63156050ead521d8e6cda17546bac007b995774 SHA1 94afb1e0426185c5c9df0af4af92d5f4344de520 SHA256 66061e8d3e1b4e574be9592b782eba216ed9f5462c31d2ff5cc2f00b967a3346 -MISC ChangeLog 4017 RMD160 979997438271fd5cfe80f1d39e941b9a063822d8 SHA1 564e8d9a135b584fbb7c863bbc879a339da4d17f SHA256 628e7935eae33f826393da3103482a8909f64f1453de12a4e3d98e270693c65e +EBUILD kde-env-4.3.5-r1.ebuild 1834 RMD160 9edd8ca901743bf978c2d40830ac13f481668b24 SHA1 b6b22eb3a1bc961d62f3747afd4246ae25cbad07 SHA256 f3272a812b8ce0130818677861a9abb3e6efe744d051a10268760c0308039f41 +MISC ChangeLog 4145 RMD160 0e1a79b64656bde6273aec9804ec70a375482863 SHA1 7d14b7522205846128d4895e439749c9f227a6d0 SHA256 7eb2411ab1f0535f3e2601118a2f40e0c79a067d7e8e38f5ae0b31d8c374e282 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktjqJYACgkQOypDUo0oQOoxngCg3vpJiLvy/tsgttbQ+OdmV3B1 -ayUAnA/AOhbWEEnGvru8MnabWgeSl5fg -=lF3I +iEYEARECAAYFAktmKuIACgkQOypDUo0oQOqPVQCghijcxmBHaDUxLxlzTVawYOBn +SoYAoNstbbgAjPBCuzcQZkKATsKIc/J7 +=8a1m -----END PGP SIGNATURE----- diff --git a/kde-base/kde-env/kde-env-4.3.5-r1.ebuild b/kde-base/kde-env/kde-env-4.3.5-r1.ebuild index 21bcdf7f334e..ca2edcc67628 100644 --- a/kde-base/kde-env/kde-env-4.3.5-r1.ebuild +++ b/kde-base/kde-env/kde-env-4.3.5-r1.ebuild @@ -1,9 +1,10 @@ # 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.5-r1.ebuild,v 1.1 2010/01/30 03:33:33 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.3.5-r1.ebuild,v 1.2 2010/02/01 01:14:00 abcd Exp $ EAPI="2" +CMAKE_REQUIRED="never" KDE_REQUIRED="never" inherit kde4-base @@ -17,21 +18,10 @@ IUSE="" add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3 -src_unpack() { - : -} - -src_prepare() { - : -} - -src_configure() { - : -} +S=${WORKDIR} -src_compile() { - : -} +src_unpack() { :; } +src_prepare() { :; } src_install() { if use kdeprefix; then @@ -43,7 +33,7 @@ src_install() { _libdirs=${_libdirs#:} # number goes down with version - cat <<-EOF > "${T}/43kdepaths-${SLOT}" + cat <<-EOF > 43kdepaths-${SLOT} PATH="${EKDEDIR}/bin" ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin" LDPATH="${_libdirs}" @@ -53,35 +43,27 @@ CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/sha PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig" XDG_DATA_DIRS="${EKDEDIR}/share" EOF - doenvd "${T}/43kdepaths-${SLOT}" - cat <<-EOF > "${T}/50-kde-${SLOT}" + doenvd 43kdepaths-${SLOT} + cat <<-EOF > 50-kde-${SLOT} SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*" EOF insinto /etc/revdep-rebuild - doins "${T}/50-kde-${SLOT}" + doins 50-kde-${SLOT} # kdeglobals needed to make third party apps installed in /usr work - cat <<-EOF > "${T}/kdeglobals" + cat <<-EOF > kdeglobals [Directories][\$i] prefixes=${EPREFIX}/usr EOF insinto ${KDEDIR}/share/config - doins "${T}/kdeglobals" + doins kdeglobals else # Much simpler for the FHS compliant -kdeprefix install # number goes down with version - cat <<-EOF > "${T}/43kdepaths" + cat <<-EOF > 43kdepaths CONFIG_PROTECT="/usr/share/config" #KDE_IS_PRELINKED=1 EOF - doenvd "${T}/43kdepaths" + doenvd 43kdepaths fi } - -pkg_preinst() { - : -} - -src_test() { - : -} |