[patch] ebuild patch for version bump to 3.11.2

meld-ebuild.patch (text/plain), 2.50 KB, created by poncho on 2014-08-21 13:24:36 UTC

--- /var/portage/tree/dev-util/meld/meld-1.8.5.ebuild	2014-07-23 17:31:11.000000000 +0200
+++ dev-util/meld/meld-3.11.2.ebuild	2014-08-21 14:59:53.163632449 +0200
@@ -1,73 +1,37 @@
 # 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.5.ebuild,v 1.3 2014/07/23 15:16:02 ago Exp $
+# $Header: $
 
 EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit eutils python-single-r1 gnome2
+inherit gnome2 distutils-r1
 
 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}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
+	dev-libs/glib: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}] )
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.6.0:3
+	>=x11-libs/gtksourceview-3.6.0:3.0
+	x11-themes/hicolor-icon-theme
 "
 DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/gtk-doc-am
+	sys-devel/gettext
 	dev-util/intltool
+	dev-util/itstool
 "
 
-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
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 }