Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-util/meld/ChangeLog12
-rw-r--r--dev-util/meld/Manifest20
-rw-r--r--dev-util/meld/meld-1.1.5.1-r1.ebuild56
-rw-r--r--dev-util/meld/meld-1.1.5.1.ebuild49
-rw-r--r--dev-util/meld/meld-1.2-r1.ebuild70
-rw-r--r--dev-util/meld/meld-1.2.ebuild67
-rw-r--r--dev-util/meld/meld-1.3.0.ebuild73
7 files changed, 97 insertions, 250 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 7fe91ccc8258..58d7d1776e73 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for dev-util/meld
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.94 2009/03/25 19:10:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.95 2009/04/20 22:37:24 eva Exp $
+
+*meld-1.3.0 (20 Apr 2009)
+
+ 20 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> +meld-1.3.0.ebuild:
+ Bump to 1.3.0. Add die clause everywhere, fix installation of all locales
+ when LINGUAS is unset. Support for subversion 1.6 and a few other things.
+
+ 20 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.1.5.1.ebuild,
+ -meld-1.1.5.1-r1.ebuild, -meld-1.2.ebuild, -meld-1.2-r1.ebuild:
+ Remove old revisions.
25 Mar 2009; Raúl Porcel <armin76@gentoo.org> meld-1.2.1.ebuild:
ia64/sparc stable wrt #263618
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 6b3ed8fa9dd3..209adc08a501 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,12 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX meld-1.2-fr-help-install-fix.patch 819 RMD160 06c6bdfea5346139feb912bc259d750e0b744ae3 SHA1 0338d0331cad4efb4f2a51dd0307ff4be092254d SHA256 d3380b4cb233a66440c5f1738d8fe3b40b508ced7c4e4902d2d22a06ecfbfa30
AUX meld-1.2-wrap-list.patch 3322 RMD160 3e34936ae64ff7c00c6294721f3bd79e2e67e8d4 SHA1 32389e752a947a1b57132dd4f7757c6573479aea SHA256 6c65d11b84be0a6c6ec2b39cc24f68b1f1ce75c8246d5c61b503ef65ea973520
-DIST meld-1.1.5.1.tar.bz2 602859 RMD160 8ac6e0b6518388f188ab6a0f13ace67aad02fef4 SHA1 047bc68184ed18d490bc41658c7d2d3d8950696a SHA256 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38
DIST meld-1.2.1.tar.bz2 699861 RMD160 4b38b786bbe1551a5434c54f00b77556e2f8f8b3 SHA1 8c50e2b03ebc175d771539043c9db3a128373ab8 SHA256 8ed7834a40fa10aaea33981bcc8f9862afd073461a258fe008e16b6b0c156394
-DIST meld-1.2.tar.bz2 616975 RMD160 a06fee2f8f882a1edba329bd0be7797f89852920 SHA1 aa246307226332b865216d139c10de4c73562fc1 SHA256 361befb14a0391b21ab9d96ee1ebd93c09246a135c07a0636d6d50895ededc0f
-EBUILD meld-1.1.5.1-r1.ebuild 1497 RMD160 1be9bf2a35108ae03fc121f621704ec781e183a1 SHA1 22220c6d5414f62c5d79b1b270a02d23fa925f72 SHA256 0f8607da349cf7dde2fe5afec815e70656d12c649cecc5d0421ddb481fb9f7ca
-EBUILD meld-1.1.5.1.ebuild 1207 RMD160 3ba400cd955be3555f2bea1c0d38906a6aff899f SHA1 a9bfe86a1c653592c9fe8ccae83485a56171e0ef SHA256 55fad28cd6fd96ae958cf9852f675fd99b330916ef9cdeca06707076644abea4
-EBUILD meld-1.2-r1.ebuild 1865 RMD160 7cf6cf5b69b845b9c4ed452ca8a245d15160c9de SHA1 8e94e7a4393aeed6d14b6b1c5e64517cfbb5b8be SHA256 2e7cf3903616283f378b58f921b297ced88171604ad7b2a7334b31a04048e648
+DIST meld-1.3.0.tar.bz2 799554 RMD160 d001f2a74fe25f2bf6539bc29e9d9be8b5f4a94b SHA1 a8b53d3f3e4ff1ededfef4ce500c2d664cb3af75 SHA256 94a6f834ce236fc1efb026fb9a875c8cb51d2c4f82361b0c989bef38ae015bfc
EBUILD meld-1.2.1.ebuild 1727 RMD160 5ef480ea9f8b8cd4bc9581380c9f41b4b7cbaa39 SHA1 0cd89c91db1bafd9ee58424c19c9581ea723a1a5 SHA256 500376c42884518da23686fc59c47e446a38d8c8494666b2f2a58f38b28cfec1
-EBUILD meld-1.2.ebuild 1779 RMD160 30811a2691cd190d83bc6ba0f2a766a92332fbe7 SHA1 54434bc43f659cd5448085765413865249c3ebe7 SHA256 9e239a735a8f996083f2149decb144559ce73184f1c5507d4bba820600a9649e
-MISC ChangeLog 12579 RMD160 61137031e658cb621fdd9475547e2aae33589d19 SHA1 a9672f4fb517bafdcaa000f0e2efd555f5843da0 SHA256 8450ff4f20a72fd4ca010805a759521b755ab6ed495e5455e4105860ee45dda6
+EBUILD meld-1.3.0.ebuild 1834 RMD160 290f72b66537c3ae5a7997b2ce9a4da22e03462d SHA1 d362a5af624bc020e83d560f0a31fce014c44b90 SHA256 5be21c4a801924b943b2a585425cf84b353c55c94cdd577b6fe5fb4a83daef56
+MISC ChangeLog 12996 RMD160 65810911d9afa4a1308f02c7820b1f819a2c2d84 SHA1 7fd7a738b10563493d6f1a50bf5d5f3849714f60 SHA256 fcfea5af814cd4a2535c6abc441df7a14d93736bb13fb929df11492b56d5a050
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkns+SoACgkQ1fmVwcYIWAbuWgCeKnnN9C055nrzYHN/J+H2ymc0
+FQEAn3fIcdPmRhtaeehMRMBTwT8rz0rl
+=sHz+
+-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.1.5.1-r1.ebuild b/dev-util/meld/meld-1.1.5.1-r1.ebuild
deleted file mode 100644
index 0b632761a0a6..000000000000
--- a/dev-util/meld/meld-1.1.5.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.5.1-r1.ebuild,v 1.7 2008/07/25 16:39:15 armin76 Exp $
-
-inherit python gnome2 eutils multilib
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc gnome"
-
-RDEPEND=">=dev-lang/python-2.3
- >=gnome-base/libglade-2
- >=gnome-base/libgnome-2
- >=dev-python/gnome-python-2.6.0
- >=dev-python/pygtk-2.6.0
- >=dev-python/pyorbit-1.99.0
- gnome? ( dev-python/gnome-python-desktop )"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- app-text/scrollkeeper"
-
-DOCS="AUTHORS README.CVS changelog help/"
-
-src_unpack() {
- gnome2_src_unpack
-
- # fix the prefix so its not in */local/*
- sed -i -e 's:/usr/local:/usr:' INSTALL
- sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" INSTALL
-
- # don't install anything to /usr/share/doc/meld
- sed -i -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" INSTALL
-
- # let the python eclass handle python objects
- sed -i -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' GNUmakefile
-
- # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
- sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile
-}
-
-src_compile() {
- emake || die "make failed"
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.1.5.1.ebuild b/dev-util/meld/meld-1.1.5.1.ebuild
deleted file mode 100644
index 0c6487f321bf..000000000000
--- a/dev-util/meld/meld-1.1.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.5.1.ebuild,v 1.9 2008/05/29 16:48:04 hawking Exp $
-
-inherit python gnome2 eutils multilib
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
-IUSE="doc gnome"
-
-RDEPEND=">=dev-lang/python-2.3
- >=gnome-base/libglade-2
- >=gnome-base/libgnome-2
- >=dev-python/gnome-python-2.6.0
- >=dev-python/pygtk-2.6.0
- >=dev-python/pyorbit-1.99.0
- gnome? ( dev-python/gnome-python-desktop )"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- app-text/scrollkeeper"
-
-DOCS="AUTHORS README.CVS changelog help/"
-
-src_unpack() {
- gnome2_src_unpack
-
- # fix the prefix so its not in */local/*
- sed -i -e 's:/usr/local:/usr:' INSTALL
-
- # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
- sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile
-}
-
-src_compile() {
- emake || die "make failed"
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.2-r1.ebuild b/dev-util/meld/meld-1.2-r1.ebuild
deleted file mode 100644
index ec7890828886..000000000000
--- a/dev-util/meld/meld-1.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.2-r1.ebuild,v 1.1 2008/11/16 19:33:00 eva Exp $
-
-inherit python gnome2 eutils multilib
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc gnome"
-
-RDEPEND=">=dev-lang/python-2.3
- >=gnome-base/libglade-2
- >=gnome-base/libgnome-2
- >=dev-python/gnome-python-2.6.0
- >=dev-python/pygtk-2.6.0
- >=dev-python/pyorbit-1.99.0
- gnome? ( dev-python/gnome-python-desktop )"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- app-text/scrollkeeper"
-
-DOCS="AUTHORS changelog help/"
-
-src_unpack() {
- gnome2_src_unpack
-
- # Fix installation bug for french help, mentioned in bug 230665
- epatch "${FILESDIR}/${P}-fr-help-install-fix.patch"
-
- # Fix word-wrapping option list, bug #246261
- epatch "${FILESDIR}/${P}-wrap-list.patch"
-
- # fix the prefix so its not in */local/*
- sed -i -e 's:/usr/local:/usr:' INSTALL
- sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" INSTALL
-
- # don't install anything to /usr/share/doc/meld
- sed -i -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" INSTALL
-
- # let the python eclass handle python objects
- sed -i -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' GNUmakefile
-
- # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
- sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile
-
- strip-linguas -i "${S}/po"
- local mylinguas=""
- for x in ${LINGUAS}; do
- mylinguas="${mylinguas} ${x}.po"
- done
-
- sed -i -e "s/PO:=.*/PO:=${mylinguas}/" po/GNUmakefile
-}
-
-src_compile() {
- emake || die "make failed"
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.2.ebuild b/dev-util/meld/meld-1.2.ebuild
deleted file mode 100644
index 3a9eff0eac74..000000000000
--- a/dev-util/meld/meld-1.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.2.ebuild,v 1.6 2008/11/12 21:53:54 ranger Exp $
-
-inherit python gnome2 eutils multilib
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc gnome"
-
-RDEPEND=">=dev-lang/python-2.3
- >=gnome-base/libglade-2
- >=gnome-base/libgnome-2
- >=dev-python/gnome-python-2.6.0
- >=dev-python/pygtk-2.6.0
- >=dev-python/pyorbit-1.99.0
- gnome? ( dev-python/gnome-python-desktop )"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- app-text/scrollkeeper"
-
-DOCS="AUTHORS README.CVS changelog help/"
-
-src_unpack() {
- gnome2_src_unpack
-
- # Fix installation bug for french help, mentioned in bug 230665
- epatch "${FILESDIR}/${P}-fr-help-install-fix.patch"
-
- # fix the prefix so its not in */local/*
- sed -i -e 's:/usr/local:/usr:' INSTALL
- sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" INSTALL
-
- # don't install anything to /usr/share/doc/meld
- sed -i -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" INSTALL
-
- # let the python eclass handle python objects
- sed -i -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' GNUmakefile
-
- # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
- sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile
-
- strip-linguas -i "${S}/po"
- local mylinguas=""
- for x in ${LINGUAS}; do
- mylinguas="${mylinguas} ${x}.po"
- done
-
- sed -i -e "s/PO:=.*/PO:=${mylinguas}/" po/GNUmakefile
-}
-
-src_compile() {
- emake || die "make failed"
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.3.0.ebuild b/dev-util/meld/meld-1.3.0.ebuild
new file mode 100644
index 000000000000..0826b71faced
--- /dev/null
+++ b/dev-util/meld/meld-1.3.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.0.ebuild,v 1.1 2009/04/20 22:37:24 eva Exp $
+
+inherit python gnome2 eutils multilib
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/python-2.4
+ >=gnome-base/libglade-2
+ >=gnome-base/libgnome-2
+
+ >=dev-python/gconf-python-2.22
+ >=dev-python/libgnome-python-2.22
+ >=dev-python/gnome-vfs-python-2.22
+ >=dev-python/pygtk-2.8.0
+ >=dev-python/pyorbit-2.8"
+
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ app-text/scrollkeeper"
+
+DOCS="AUTHORS changelog help/"
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # fix the prefix so its not in */local/*
+ sed -e 's:/usr/local:/usr:' \
+ -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \
+ -i INSTALL || die "sed 1 failed"
+
+ # don't install anything to /usr/share/doc/meld
+ sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \
+ -i INSTALL || die "sed 2 failed"
+
+ # let the python eclass handle python objects
+ sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \
+ -i GNUmakefile || die "sed 3 failed"
+
+ # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
+ sed -e '/scrollkeeper-update/s/\t/&#/' \
+ -i help/*/GNUmakefile || die "sed 4 failed"
+
+ strip-linguas -i "${S}/po"
+ local mylinguas=""
+ for x in ${LINGUAS}; do
+ mylinguas="${mylinguas} ${x}.po"
+ done
+
+ if [ -n "${mylinguas}" ]; then
+ sed -e "s/PO:=.*/PO:=${mylinguas}/" \
+ -i po/GNUmakefile || die "sed 5 failed"
+ fi
+}
+
+src_compile() {
+ emake || die "make failed"
+}
+
+pkg_postinst() {
+ python_mod_optimize /usr/$(get_libdir)/meld
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/$(get_libdir)/meld
+}