Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/meld
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-04-26 07:32:17 +0000
committerPacho Ramos <pacho@gentoo.org>2014-04-26 07:32:17 +0000
commite329f8db258f0111d2db68e23c1d1c811a259c8a (patch)
tree9abf0b8eb6d25158ad601decaf560e43ca4fa6d3 /dev-util/meld
parentdrop old (diff)
downloadgentoo-2-e329f8db258f0111d2db68e23c1d1c811a259c8a.tar.gz
gentoo-2-e329f8db258f0111d2db68e23c1d1c811a259c8a.tar.bz2
gentoo-2-e329f8db258f0111d2db68e23c1d1c811a259c8a.zip
drop old
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog6
-rw-r--r--dev-util/meld/meld-1.7.0.ebuild99
-rw-r--r--dev-util/meld/meld-1.8.1.ebuild74
-rw-r--r--dev-util/meld/meld-1.8.2.ebuild74
4 files changed, 5 insertions, 248 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 18858374aa7a..5bf3a6bd2980 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.179 2014/03/09 11:56:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.180 2014/04/26 07:32:15 pacho Exp $
+
+ 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -meld-1.7.0.ebuild,
+ -meld-1.8.1.ebuild, -meld-1.8.2.ebuild:
+ drop old
09 Mar 2014; Pacho Ramos <pacho@gentoo.org> meld-1.8.4.ebuild:
x86 stable, bug 499954
diff --git a/dev-util/meld/meld-1.7.0.ebuild b/dev-util/meld/meld-1.7.0.ebuild
deleted file mode 100644
index 501f76ddd152..000000000000
--- a/dev-util/meld/meld-1.7.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.9 2013/04/01 18:24:28 ago Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python gnome2 multilib
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+highlight gnome"
-
-RDEPEND=">=dev-python/pygtk-2.14:2
- >=dev-python/pygobject-2.8:2
- dev-python/dbus-python
- dev-python/pycairo
- highlight? ( >=dev-python/pygtksourceview-2.10 )
- gnome? ( >=dev-python/gconf-python-2.22:2 )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- app-text/scrollkeeper
-"
-
-pkg_setup() {
- # Needed for optimizing python modules against proper interpreter
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- DOCS="NEWS"
-
- # fix the prefix so its not in */local/*
- sed -e "s:/usr/local:${EPREFIX}/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 Makefile || 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/*/Makefile || die "sed 4 failed"
-
- # replace all calls to python by specific major version
- sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \
- -i INSTALL || die "sed 6 failed"
- python_convert_shebangs 2 "${S}"/tools/*
-
- 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/Makefile || die "sed 5 failed"
- fi
-
- # Fix .desktop entry, upstream bug #686978
- sed -i -e '/Encoding/d' data/meld.desktop.in || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- :
-}
-
-src_install() {
- gnome2_src_install
- doman meld.1
- python_convert_shebangs 2 "${ED}"usr/bin/meld
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.8.1.ebuild b/dev-util/meld/meld-1.8.1.ebuild
deleted file mode 100644
index 5577b5381ed8..000000000000
--- a/dev-util/meld/meld-1.8.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.1.ebuild,v 1.1 2013/09/28 20:37:09 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit eutils python-single-r1 gnome2
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+highlight gnome"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: switch gconf-python to python-r1
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] )
- gnome? ( >=dev-python/gconf-python-2.22:2 )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- app-text/scrollkeeper
-"
-
-src_prepare() {
- # fix the prefix so its not in */local/*
- sed -e "s:/usr/local:${EPREFIX}/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"
-
- # don't run scrollkeeper (with the wrong path),
- # leave that to gnome2.eclass #145833
- sed -e '/scrollkeeper-update/s/\t/&#/' \
- -i help/*/Makefile || 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/Makefile || die "sed 6 failed"
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- :
-}
-
-src_install() {
- gnome2_src_install
- python_fix_shebang "${ED}"/usr/bin
- doman meld.1
-}
diff --git a/dev-util/meld/meld-1.8.2.ebuild b/dev-util/meld/meld-1.8.2.ebuild
deleted file mode 100644
index f9ea5cf7bcd5..000000000000
--- a/dev-util/meld/meld-1.8.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.2.ebuild,v 1.3 2013/12/08 18:18:33 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit eutils python-single-r1 gnome2
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+highlight gnome"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: switch gconf-python to python-r1
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] )
- gnome? ( >=dev-python/gconf-python-2.22:2 )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- app-text/scrollkeeper
-"
-
-src_prepare() {
- # fix the prefix so its not in */local/*
- sed -e "s:/usr/local:${EPREFIX}/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"
-
- # don't run scrollkeeper (with the wrong path),
- # leave that to gnome2.eclass #145833
- sed -e '/scrollkeeper-update/s/\t/&#/' \
- -i help/*/Makefile || 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/Makefile || die "sed 6 failed"
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- :
-}
-
-src_install() {
- gnome2_src_install
- python_fix_shebang "${ED}"/usr/bin
- doman meld.1
-}