pacho 14/09/04 12:06:31 Modified: ChangeLog Added: meld-1.8.6.ebuild Removed: meld-1.8.4.ebuild Log: Version bump, drop old (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path 1.184 dev-util/meld/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.184&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?rev=1.184&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/ChangeLog?r1=1.183&r2=1.184 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- ChangeLog 23 Jul 2014 15:16:02 -0000 1.183 +++ ChangeLog 4 Sep 2014 12:06:31 -0000 1.184 @@ -1,6 +1,12 @@ # 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.183 2014/07/23 15:16:02 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.184 2014/09/04 12:06:31 pacho Exp $ + +*meld-1.8.6 (04 Sep 2014) + + 04 Sep 2014; Pacho Ramos <[email protected]> +meld-1.8.6.ebuild, + -meld-1.8.4.ebuild: + Version bump, drop old 23 Jul 2014; Agostino Sarubbo <[email protected]> meld-1.8.5.ebuild: Stable for x86, wrt bug #512012 1.1 dev-util/meld/meld-1.8.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.8.6.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/meld/meld-1.8.6.ebuild?rev=1.1&content-type=text/plain Index: meld-1.8.6.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.6.ebuild,v 1.1 2014/09/04 12:06:31 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}" 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[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} app-text/scrollkeeper dev-util/gtk-doc-am dev-util/intltool " 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 }
