From a073f5c49554a27f1b4e82b533a3dae5a68fef34 Mon Sep 17 00:00:00 2001
From: "John N. Laliberte" <allanonjl@gentoo.org>
Date: Tue, 21 Feb 2006 18:29:33 +0000
Subject: version bump, fixes #123635, thanks to dcoutts for reminder (Portage
 version: 2.1_pre4-r1)

---
 dev-util/meld/ChangeLog               |  7 +++-
 dev-util/meld/Manifest                | 22 ++++++++++++-
 dev-util/meld/files/digest-meld-1.1.3 |  3 ++
 dev-util/meld/meld-1.1.3.ebuild       | 60 +++++++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 dev-util/meld/files/digest-meld-1.1.3
 create mode 100644 dev-util/meld/meld-1.1.3.ebuild

(limited to 'dev-util')

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 6508f3e46d38..25acc7fb0c1d 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.31 2006/01/08 21:41:21 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.32 2006/02/21 18:29:33 allanonjl Exp $
+
+*meld-1.1.3 (21 Feb 2006)
+
+  21 Feb 2006; John N. Laliberte <allanonjl@gentoo.org> +meld-1.1.3.ebuild:
+  version bump, fixes #123635, thanks to dcoutts for reminder
 
   08 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org> meld-1.0.0.ebuild,
   meld-1.1.2.ebuild:
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index a61af7e825f4..a8b90fb3b579 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,7 +1,27 @@
-MD5 f57846ce506acbc0cc9aab1fc4a9e710 ChangeLog 4824
+MD5 e2de46cf0146104fdda6c39501fd0a21 ChangeLog 4990
+RMD160 a6c54bddd16ac44aae940ade518d2858498b5803 ChangeLog 4990
+SHA256 6c6bf0da3ee892c5ab5951adc66ce6589e93d7e110457b93341eabd580bcab1e ChangeLog 4990
 MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63
+RMD160 e06fc9137a22b236360775a48be2dd56edbde9c9 files/digest-meld-1.0.0 63
+SHA256 6d98c0df07aed235d8e85b21a70a1c7294c964231afe133c8d6d33705b9757eb files/digest-meld-1.0.0 63
 MD5 dba9f4dc3e45ac0d468532482b381632 files/digest-meld-1.1.2 63
+RMD160 4b9dbde73f05721f8f56d534ea2a048aa88e964b files/digest-meld-1.1.2 63
+SHA256 732bf8ddab33cf4e55164bd3ea978014cb5067fefcbefe25dd2eb6666e3a5ab3 files/digest-meld-1.1.2 63
+MD5 1d95dee1f5a4b23fa11a334ef1ea4a75 files/digest-meld-1.1.3 235
+RMD160 2cfbdd98b0f1aacc04e05cf05d676a666354f117 files/digest-meld-1.1.3 235
+SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/digest-meld-1.1.3 235
 MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377
+RMD160 abb6c33943585bca10ca4d05989dfcc25717bf55 files/meld-1.0.0-frpo.patch 377
+SHA256 35f4c08a692f5c7c0c9cd5983924ea6466dd0f6eba104eece52a2ae43a9a2a16 files/meld-1.0.0-frpo.patch 377
 MD5 3648682f5d11b70e80cf429d2593615a meld-1.0.0.ebuild 1574
+RMD160 38b330437ad576eb380dca44b8dbcd2502922886 meld-1.0.0.ebuild 1574
+SHA256 14a2568e31efca9335dcf54b1aa1be6ca5c89d1a64ca57a5a9d00ab338f1422e meld-1.0.0.ebuild 1574
 MD5 edec3470faa5e4d845ea3dc560fe0b6f meld-1.1.2.ebuild 1443
+RMD160 70ed85e8e1cb801e9693d2d8ffc4561f56b61e4e meld-1.1.2.ebuild 1443
+SHA256 255e6d640a7484f1f26c67a4ebe3f9d06300e31fa00184834d31798d798a537e meld-1.1.2.ebuild 1443
+MD5 b306c55905bc3d8852ab9e3946b5bde3 meld-1.1.3.ebuild 1439
+RMD160 11c31e5b942baa373b71e6c05ec61dcc4597e6a6 meld-1.1.3.ebuild 1439
+SHA256 576acef49938008d0c5b5dbc85ada4d4912f4bd9bc60686b292f1d8a35cdde0e meld-1.1.3.ebuild 1439
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
+RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 metadata.xml 222
+SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f metadata.xml 222
diff --git a/dev-util/meld/files/digest-meld-1.1.3 b/dev-util/meld/files/digest-meld-1.1.3
new file mode 100644
index 000000000000..edc0ffcb2e63
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-1.1.3
@@ -0,0 +1,3 @@
+MD5 b958f6b3b5b849607d952f49eb082cba meld-1.1.3.tar.bz2 597967
+RMD160 43134e32b33aa2f5a405c4ad2ba90eb22b632fbc meld-1.1.3.tar.bz2 597967
+SHA256 0494636661aadf07520e6d75c986a53af136b6d6c4e71bdcb9dde01554dcbdb9 meld-1.1.3.tar.bz2 597967
diff --git a/dev-util/meld/meld-1.1.3.ebuild b/dev-util/meld/meld-1.1.3.ebuild
new file mode 100644
index 000000000000..cca97543b791
--- /dev/null
+++ b/dev-util/meld/meld-1.1.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.3.ebuild,v 1.1 2006/02/21 18:29:33 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.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=dev-python/gnome-python-2.6.0
+	>=dev-python/pygtk-2.6.0
+	>=dev-python/pyorbit-1.99.0
+	dev-python/gnome-python-extras"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/"
+
+pkg_setup() {
+	if ! built_with_use '<dev-python/pygtk-2.8.0-r2' gnome ; then
+		einfo
+		einfo "Meld requires pygtk to 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}
+	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"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/lib/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib/meld
+}
-- 
cgit v1.2.3-65-gdbad