summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-10-10 07:52:41 +0000
committerJustin Lecher <jlec@gentoo.org>2010-10-10 07:52:41 +0000
commit4f3321be89357650abdb2b95eeb27264902ef536 (patch)
treed9e6592e69cd64be83224d7c02dca91b0a1ae355 /dev-util
parentVersion bump. (diff)
downloadhistorical-4f3321be89357650abdb2b95eeb27264902ef536.tar.gz
historical-4f3321be89357650abdb2b95eeb27264902ef536.tar.bz2
historical-4f3321be89357650abdb2b95eeb27264902ef536.zip
Added prefix support, EAPI=3, keyworded for ~-linux prefix
Package-Manager: portage-2.2_rc91/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/meld/ChangeLog5
-rw-r--r--dev-util/meld/Manifest10
-rw-r--r--dev-util/meld/meld-1.4.0.ebuild16
3 files changed, 18 insertions, 13 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 834a4beb109d..689ec61fc5a1 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.111 2010/09/27 22:03:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.112 2010/10/10 07:52:41 jlec Exp $
+
+ 10 Oct 2010; Justin Lecher <jlec@gentoo.org> meld-1.4.0.ebuild:
+ Added prefix support, EAPI=3, keyworded for ~-linux prefix
*meld-1.4.0 (27 Sep 2010)
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 85d48c5a1a74..7bfe2e7c8496 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -10,13 +10,13 @@ EBUILD meld-1.3.0.ebuild 1852 RMD160 8d28d2e8bfd76f4a27d788ca5f660bdc1a421eaa SH
EBUILD meld-1.3.1.ebuild 1874 RMD160 7ee313ceca2f9ffd4dfc772a70adc9657bd7dad6 SHA1 70d7204d2906ee698d821f235ed6aff047e593e0 SHA256 9764fbe9bbf6c1457409d246371119070e6b011f86294f02571c8050ee263d56
EBUILD meld-1.3.2.ebuild 2044 RMD160 657d3857938b8f04f309e25b80bebcea003e6bfb SHA1 09a8879daa9c23c896712a4ccf9c8bb5d95d27ae SHA256 51b7815794b423ec17e21779dae411fbeb241195ac0a392e505102681486e617
EBUILD meld-1.3.3.ebuild 2038 RMD160 6fdb490c7572f2069b11d7b39d19f08febb80fc5 SHA1 8856d59afa9ea52594ccba282c4b1f6a1eca93de SHA256 019e1aa6a8f79b4c4bd9b354526a7badda2a3cbada2f74f1e3cfa953d3a96076
-EBUILD meld-1.4.0.ebuild 2038 RMD160 b134ff2dfd02ba21d78bcf6cc67728f4f4c029c3 SHA1 43ca39d041b918eb884b9d5eb84cb299765b92e8 SHA256 84360f6d5fa6eda8660b9654db26a9f2b6134eaf7148debe6f775d333f5419c9
-MISC ChangeLog 14823 RMD160 f162505ae6e9d4b6288079147c8e6d9751f7b3be SHA1 0c673d1b2b3d695024cbfa297cb1efd357ebc77c SHA256 15a36b46399fe6e6dae2fc9c596cf1f13ed2c3f9524d5c69a2097ebe56788726
+EBUILD meld-1.4.0.ebuild 2062 RMD160 fd947c0b307ac54ae0e8f7bafd21ee477329e194 SHA1 c963f30ecfd250c081bde28f14d812b93674edae SHA256 c9e3daf2563fa8a0e57addfbc4281f92fc71fd2e5b0424aa763fc1ac3f40fb80
+MISC ChangeLog 14952 RMD160 21f656bf952f2c6439445ce49bee0d8d95485229 SHA1 aa9a71c5985a11af9d2c103064ee20dc1f1e515c SHA256 8a5a274e681cf35a9fd6eeb15863de08bed68ae82822513c57620939f6560293
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkyhFKQACgkQ1fmVwcYIWAaxvQCgnPioSYs3vmOkFiLwE3B6SZvY
-aFMAoNinoRhUGPDO9F67NT8Q1J9Y3kjq
-=p9wP
+iEYEARECAAYFAkyxcOoACgkQgAnW8HDreRYQJQCeO6oqOSke/J9Hrbeb5fQnM9aQ
+c3sAoMro4FCQ6DGRd3p6v7G/BwRJRBnz
+=NkNQ
-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.4.0.ebuild b/dev-util/meld/meld-1.4.0.ebuild
index 0aaa64fcfc93..d2f5a64d9ded 100644
--- a/dev-util/meld/meld-1.4.0.ebuild
+++ b/dev-util/meld/meld-1.4.0.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.4.0.ebuild,v 1.1 2010/09/27 22:03:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.4.0.ebuild,v 1.2 2010/10/10 07:52:41 jlec Exp $
+
+EAPI="3"
GCONF_DEBUG="no"
@@ -11,7 +13,7 @@ HOMEPAGE="http://meld.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc gnome"
RDEPEND=">=dev-lang/python-2.4
@@ -30,11 +32,11 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS NEWS help/ChangeLog"
-src_unpack() {
- gnome2_src_unpack
+src_prepare() {
+ gnome2_src_prepare
# fix the prefix so its not in */local/*
- sed -e 's:/usr/local:/usr:' \
+ sed -e 's:/usr/local:${EPREFIX}/usr:' \
-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \
-i INSTALL || die "sed 1 failed"
@@ -67,8 +69,8 @@ src_unpack() {
fi
}
-src_compile() {
- emake || die "make failed"
+src_configure() {
+ :
}
pkg_postinst() {