From b052ffa1106c3ff117e2b544cb339baf4774bd29 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 28 Jul 2013 19:46:50 +0000 Subject: Version bump, drop old (Portage version: 2.1.13.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) --- dev-util/meld/ChangeLog | 8 +++- dev-util/meld/meld-1.7.2.ebuild | 81 ----------------------------------------- dev-util/meld/meld-1.7.4.ebuild | 74 +++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 82 deletions(-) delete mode 100644 dev-util/meld/meld-1.7.2.ebuild create mode 100644 dev-util/meld/meld-1.7.4.ebuild (limited to 'dev-util') diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index b217377788e0..07b59534c016 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/meld # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.167 2013/06/03 20:24:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.168 2013/07/28 19:46:50 pacho Exp $ + +*meld-1.7.4 (28 Jul 2013) + + 28 Jul 2013; Pacho Ramos +meld-1.7.4.ebuild, + -meld-1.7.2.ebuild: + Version bump, drop old *meld-1.7.3 (03 Jun 2013) diff --git a/dev-util/meld/meld-1.7.2.ebuild b/dev-util/meld/meld-1.7.2.ebuild deleted file mode 100644 index 1b44bc4fe13f..000000000000 --- a/dev-util/meld/meld-1.7.2.ebuild +++ /dev/null @@ -1,81 +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.2.ebuild,v 1.1 2013/04/22 18:17:21 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python2_{6,7} ) - -inherit eutils python-single-r1 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" - -# FIXME: switch pygtksourceview and 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" - - # don't run update-*-database, leave that to eclass - sed -e '/update-.*-database/d' \ - -i Makefile || die "sed 5 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 - - # Fix .desktop entry, upstream bug #698600 - sed -e 's/\(MimeType.*\)/\1;/' \ - -i data/meld.desktop.in || die - - gnome2_src_prepare -} - -src_configure() { - : -} - -src_install() { - DOCS="NEWS" - gnome2_src_install - python_fix_shebang "${ED}"/usr/bin - doman meld.1 -} diff --git a/dev-util/meld/meld-1.7.4.ebuild b/dev-util/meld/meld-1.7.4.ebuild new file mode 100644 index 000000000000..ac505d6bf9fb --- /dev/null +++ b/dev-util/meld/meld-1.7.4.ebuild @@ -0,0 +1,74 @@ +# 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.4.ebuild,v 1.1 2013/07/28 19:46:50 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 +} -- cgit v1.2.3-65-gdbad