new version. remove translation patch ( applied upstream ), remove pygtk/gnome warning since its now in gpe. use gnome2_omf_fix to fix scrollkeeper instead of sed. fixes #110954

(Portage version: 2.0.51.22-r3)

12 files changed, 67 insertions, 330 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 7696caed63c4..02c1b9a50d43 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.29 2005/10/02 14:29:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.30 2005/11/11 16:56:51 allanonjl Exp $
+
+*meld-1.1.2 (11 Nov 2005)
+
+  11 Nov 2005; John N. Laliberte <allanonjl@gentoo.org> -meld-0.9.2.ebuild,
+  -meld-0.9.4.1.ebuild, -meld-0.9.4.1-r1.ebuild, -meld-0.9.5.ebuild,
+  +meld-1.1.2.ebuild:
+  new version. remove translation patch ( applied upstream ), remove
+  pygtk/gnome warning since its now in gpe. use gnome2_omf_fix to fix
+  scrollkeeper instead of sed. fixes #110954
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org> meld-1.0.0.ebuild:
   Mark 1.0.0 stable on ia64
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 0fa192a41a0b..ff5e5734ed2f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,13 +1,7 @@
-MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 755c60c1d2fefc9c060009e159302194 ChangeLog 4283
-MD5 d3c2c25cbc4a8994ae2ca7bf61ef2b33 meld-0.9.4.1.ebuild 1786
-MD5 979d593ab87d2d50229a50d20d27ac4e meld-0.9.5.ebuild 2006
-MD5 96ed5fd3c9961f4e4787f897e666bddb meld-0.9.2.ebuild 1538
+MD5 ca9865ac829722d064e55c99706b4ad2 meld-1.1.2.ebuild 1155
 MD5 8918134f77a1ef3cd8fc4d584ecc2b85 meld-1.0.0.ebuild 1563
-MD5 89ff1bd3f22c6fd40a90e9cb18970b4b meld-0.9.4.1-r1.ebuild 2081
-MD5 204fd0bd70dc55fec4d8b060a3165d94 files/digest-meld-0.9.2 63
-MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63
-MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1-r1 65
+MD5 18dc355b6cc09cb4159d551923aad32d ChangeLog 4662
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
 MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377
-MD5 f5c312891794c9078a4c034256c3901c files/digest-meld-0.9.5 63
-MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1 65
+MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63
+MD5 dba9f4dc3e45ac0d468532482b381632 files/digest-meld-1.1.2 63
diff --git a/dev-util/meld/files/digest-meld-0.9.2 b/dev-util/meld/files/digest-meld-0.9.2
deleted file mode 100644
index 9a129c64d352..000000000000
--- a/dev-util/meld/files/digest-meld-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f084e1e3ea9c12f784a35c09570f857 meld-0.9.2.tar.bz2 126738
diff --git a/dev-util/meld/files/digest-meld-0.9.4.1 b/dev-util/meld/files/digest-meld-0.9.4.1
deleted file mode 100644
index c177a2890077..000000000000
--- a/dev-util/meld/files/digest-meld-0.9.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd5f02e084529c581ce52a22647ca4dc meld-0.9.4.1.tar.bz2 333123
diff --git a/dev-util/meld/files/digest-meld-0.9.4.1-r1 b/dev-util/meld/files/digest-meld-0.9.4.1-r1
deleted file mode 100644
index c177a2890077..000000000000
--- a/dev-util/meld/files/digest-meld-0.9.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd5f02e084529c581ce52a22647ca4dc meld-0.9.4.1.tar.bz2 333123
diff --git a/dev-util/meld/files/digest-meld-0.9.5 b/dev-util/meld/files/digest-meld-0.9.5
deleted file mode 100644
index 1dda9b12bb0e..000000000000
--- a/dev-util/meld/files/digest-meld-0.9.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc86bf6f5ed1887da6a28ac1d91eb78d meld-0.9.5.tar.bz2 283080
diff --git a/dev-util/meld/files/digest-meld-1.1.2 b/dev-util/meld/files/digest-meld-1.1.2
new file mode 100644
index 000000000000..77263bea8ae7
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-1.1.2
@@ -0,0 +1 @@
+MD5 a00473f852c32db0bcd48c84b0f27869 meld-1.1.2.tar.bz2 588213
diff --git a/dev-util/meld/meld-0.9.2.ebuild b/dev-util/meld/meld-0.9.2.ebuild
deleted file mode 100644
index 51b0fa06efb1..000000000000
--- a/dev-util/meld/meld-0.9.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.2.ebuild,v 1.6 2005/01/27 21:34:02 agriffis Exp $
-
-inherit python gnome.org
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 alpha ~sparc ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-python/gnome-python-1.99.15
-	>=dev-python/pygtk-1.99.15
-	>=dev-python/pyorbit-1.99.0"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	# do manual injection of *dirs instead of using make install
-	# to get around lack of DESTDIR
-	cd ${S}
-	python tools/install_paths libdir=/usr/lib/meld < meld > meld.install
-	newbin meld.install meld
-
-	insinto /usr/lib/meld
-	doins *.py
-	python tools/install_paths \
-		localedir=/usr/share/locale \
-		docdir=/usr/share/doc/${PF} \
-		sharedir=/usr/share/meld < paths.py > paths.py.install
-
-	newins paths.py.install paths.py
-
-	insinto /usr/share/meld/glade2
-	doins glade2/*
-	insinto /usr/share/meld/glade2/pixmaps
-	doins glade2/pixmaps/*
-	insinto /usr/share/pixmaps
-	newins glade2/pixmaps/icon.png meld-icon.png
-
-	insinto /usr/share/applications
-	doins meld.desktop
-
-	dodoc AUTHORS COPYING INSTALL TODO.txt
-	insinto /usr/share/doc/${PF}
-	doins manual/*
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/meld
-}
diff --git a/dev-util/meld/meld-0.9.4.1-r1.ebuild b/dev-util/meld/meld-0.9.4.1-r1.ebuild
deleted file mode 100644
index 01e152596dd5..000000000000
--- a/dev-util/meld/meld-0.9.4.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.4.1-r1.ebuild,v 1.2 2005/07/13 13:54:57 swegener Exp $
-
-inherit python gnome.org eutils
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-python/gnome-python-1.99.15
-	>=dev-python/pygtk-1.99.15
-	>=dev-python/pyorbit-1.99.0"
-
-# need to add optional dependency for pygtksourceview when it is in portage.
-# - liquidx (16 Oct 2004)
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-
-	if ! built_with_use dev-python/pygtk gnome ; then
-		einfo ""
-		einfo "Meld requires pygtk be built with the gnome use flag set."
-		einfo "Please re-emerge pygtk with the gnome use flag set."
-		einfo ""
-		die "You need to re-emerge pygtk with gnome use flag."
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-	# Fix the .desktop icon name, see bug #73550
-	sed -i -e "s:Icon=meld:Icon=meld-icon.png:" ${S}/meld.desktop.in
-
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	# do manual injection of *dirs instead of using make install
-	# to get around lack of DESTDIR
-	cd ${S}
-	python tools/install_paths libdir=/usr/lib/meld < meld > meld.install
-	newbin meld.install meld
-
-	insinto /usr/lib/meld
-	doins *.py
-	python tools/install_paths \
-		localedir=/usr/share/locale \
-		docdir=/usr/share/doc/${P} \
-		sharedir=/usr/share/meld < paths.py > paths.py.install
-
-	newins paths.py.install paths.py
-
-	insinto /usr/share/meld/glade2
-	doins glade2/*
-	insinto /usr/share/meld/glade2/pixmaps
-	doins glade2/pixmaps/*
-	insinto /usr/share/pixmaps
-	newins glade2/pixmaps/icon.png meld-icon.png
-
-	insinto /usr/share/applications
-	doins meld.desktop
-
-	dodoc AUTHORS COPYING INSTALL TODO.txt
-	insinto /usr/share/doc/${P}
-	doins manual/*
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/meld
-}
diff --git a/dev-util/meld/meld-0.9.4.1.ebuild b/dev-util/meld/meld-0.9.4.1.ebuild
deleted file mode 100644
index 8385ab784e61..000000000000
--- a/dev-util/meld/meld-0.9.4.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.4.1.ebuild,v 1.6 2005/07/05 18:01:31 gustavoz Exp $
-
-inherit python gnome.org
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha sparc ppc amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-python/gnome-python-1.99.15
-	>=dev-python/pygtk-1.99.15
-	>=dev-python/pyorbit-1.99.0"
-
-# need to add optional dependency for pygtksourceview when it is in portage.
-# - liquidx (16 Oct 2004)
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-
-	unpack ${A}
-	# Fix the .desktop icon name, see bug #73550
-	sed -i -e "s:Icon=meld:Icon=meld-icon.png:" ${S}/meld.desktop.in
-
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	# do manual injection of *dirs instead of using make install
-	# to get around lack of DESTDIR
-	cd ${S}
-	python tools/install_paths libdir=/usr/lib/meld < meld > meld.install
-	newbin meld.install meld
-
-	insinto /usr/lib/meld
-	doins *.py
-	python tools/install_paths \
-		localedir=/usr/share/locale \
-		docdir=/usr/share/doc/${PF} \
-		sharedir=/usr/share/meld < paths.py > paths.py.install
-
-	newins paths.py.install paths.py
-
-	insinto /usr/share/meld/glade2
-	doins glade2/*
-	insinto /usr/share/meld/glade2/pixmaps
-	doins glade2/pixmaps/*
-	insinto /usr/share/pixmaps
-	newins glade2/pixmaps/icon.png meld-icon.png
-
-	insinto /usr/share/applications
-	doins meld.desktop
-
-	dodoc AUTHORS COPYING INSTALL TODO.txt
-	insinto /usr/share/doc/${PF}
-	doins manual/*
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/meld
-}
diff --git a/dev-util/meld/meld-0.9.5.ebuild b/dev-util/meld/meld-0.9.5.ebuild
deleted file mode 100644
index 1535dd7d1f50..000000000000
--- a/dev-util/meld/meld-0.9.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.5.ebuild,v 1.2 2005/07/13 13:54:57 swegener Exp $
-
-inherit python gnome.org eutils
-
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=dev-python/gnome-python-1.99.15
-	>=dev-python/pygtk-1.99.15
-	>=dev-python/pyorbit-1.99.0
-	dev-python/gnome-python-extras
-	"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-
-	if ! built_with_use dev-python/pygtk gnome ; then
-		einfo ""
-		einfo "Meld requires pygtk be built with the gnome use flag set."
-		einfo "Please re-emerge pygtk with the gnome use flag set."
-		einfo ""
-		die "You need to re-emerge pygtk with gnome use flag."
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-	# Fix the .desktop icon name, see bug #73550
-	sed -i -e "s:Icon=meld:Icon=meld-icon.png:" ${S}/meld.desktop.in
-
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	# do manual injection of *dirs instead of using make install
-	# to get around lack of DESTDIR
-	cd ${S}
-	python tools/install_paths libdir=/usr/lib/meld < meld > meld.install
-	newbin meld.install meld
-
-	insinto /usr/lib/meld
-	doins *.py
-	python tools/install_paths \
-		localedir=/usr/share/locale \
-		docdir=/usr/share/doc/${P} \
-		sharedir=/usr/share/meld < paths.py > paths.py.install
-
-	newins paths.py.install paths.py
-
-	insinto /usr/share/meld/glade2
-	doins glade2/*
-	insinto /usr/share/meld/glade2/pixmaps
-	doins glade2/pixmaps/*
-	insinto /usr/share/pixmaps
-	newins glade2/pixmaps/icon.png meld-icon.png
-
-	insinto /usr/share/applications
-	doins meld.desktop
-
-	dodoc AUTHORS COPYING INSTALL TODO.txt
-	insinto /usr/share/doc/${P}
-	doins manual/*
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib/meld
-}
diff --git a/dev-util/meld/meld-1.1.2.ebuild b/dev-util/meld/meld-1.1.2.ebuild
new file mode 100644
index 000000000000..4e4ecd29c57a
--- /dev/null
+++ b/dev-util/meld/meld-1.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.2.ebuild,v 1.1 2005/11/11 16:56:51 allanonjl Exp $
+
+inherit python gnome2 eutils
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-lang/python-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-python/gnome-python-1.99.15
+	>=dev-python/pygtk-1.99.15
+	>=dev-python/pyorbit-1.99.0
+	dev-python/gnome-python-extras
+	"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Fix the .desktop icon name
+	sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
+
+	# fix omf scrollkeeper
+	gnome2_omf_fix help/*/GNUmakefile
+
+	# fix the prefix so its not in */local/*
+	sed -i -e 's:/usr/local:/usr:' INSTALL
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/"
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/meld
+}