two patches for anjuta-1.2.1 to try and fix the issue in bug 42959. they seem to work locally... test away, oh faithful users

6 files changed, 76 insertions, 5 deletions

diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog
index 1781ad671d7d..a4609a6c51c9 100644
--- a/dev-util/anjuta/ChangeLog
+++ b/dev-util/anjuta/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/anjuta
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.31 2004/02/23 19:21:24 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.32 2004/04/08 20:04:41 lisa Exp $
+
+*anjuta-1.2.1-r1 (08 Apr 2004)
+
+  08 Apr 2004; Lisa Seelye <lisa@gentoo.org> anjuta-1.2.1-r1.ebuild,
+  files/anjuta-1.2.1.fix.cmp.usage.diff.gz,
+  files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz:
+  two patches for anjuta-1.2.1 to try and fix the issue in bug 42959. they seem
+  to work locally... test away, oh faithful users
 
   23 Feb 2004; Sven Blumenstein <bazik@gentoo.org> anjuta-1.2.1.ebuild:
   Stable on sparc. Thanks to Lars Weiler <pylon@gentoo.org> for testing!
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index f992bb31e98c..94cd0a9766b4 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,9 +1,13 @@
-MD5 2f8327ebde8ae2472dc14e733af80685 ChangeLog 3931
-MD5 199c821c326a39c6ebe99618443156f0 anjuta-1.0.2.ebuild 1237
-MD5 fb4a138b3d0b72a6e485c4cd60124a79 anjuta-1.2.0.ebuild 1364
 MD5 dd83471bf71a573d86fe48fef6ff5118 anjuta-1.2.1.ebuild 1386
+MD5 fb4a138b3d0b72a6e485c4cd60124a79 anjuta-1.2.0.ebuild 1364
 MD5 d15fb5815497bed48e1b2479573388a7 metadata.xml 214
+MD5 11a301b6834fd41d3cb61ec7bf51224a ChangeLog 4261
+MD5 199c821c326a39c6ebe99618443156f0 anjuta-1.0.2.ebuild 1237
+MD5 32d17693e8cd1de7a7020d09f38cf5b3 anjuta-1.2.1-r1.ebuild 1502
 MD5 14e73ac6e0c7c2dd18f51c92bbea0f0d files/anjuta-1.2.0_xim.patch 5241
-MD5 e85b6f172c9060236ecad97dd8d434e8 files/digest-anjuta-1.0.2 65
 MD5 b0a44b11bc057a2ca046442055e5bd76 files/digest-anjuta-1.2.0 65
+MD5 46b29648047d8b6f398457e635e08d92 files/anjuta-1.2.1.fix.cmp.usage.diff.gz 643
+MD5 96da963356329dc0b96562dbf30ba0cd files/digest-anjuta-1.2.1-r1 65
+MD5 e85b6f172c9060236ecad97dd8d434e8 files/digest-anjuta-1.0.2 65
+MD5 9e4dc19186e833fd1022c8ebd3932920 files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz 292
 MD5 96da963356329dc0b96562dbf30ba0cd files/digest-anjuta-1.2.1 65
diff --git a/dev-util/anjuta/anjuta-1.2.1-r1.ebuild b/dev-util/anjuta/anjuta-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..be16630bb6c0
--- /dev/null
+++ b/dev-util/anjuta/anjuta-1.2.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.1-r1.ebuild,v 1.1 2004/04/08 20:04:41 lisa Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A versatile IDE for GNOME"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://anjuta.sourceforge.net/"
+
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+# Future versions will work with 64-bit archs, but 1.2.0 doesn't
+KEYWORDS="~x86 ~ppc sparc ~amd64"
+
+RDEPEND=">=dev-libs/glib-2.0.6
+	>=x11-libs/gtk+-2.0.8
+	>=gnome-base/ORBit2-2.4
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.0.2
+	>=gnome-base/libgnomeui-2.0.2
+	>=gnome-base/libgnomeprint-2.0.1
+	>=gnome-base/libgnomeprintui-2.0.1
+	>=gnome-base/gnome-vfs-2.0.2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2.0.1
+	>=x11-libs/vte-0.9
+	>=dev-libs/libxml2-2.4.23
+	>=x11-libs/pango-1.1.1
+	dev-libs/libpcre
+	app-text/scrollkeeper"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+#	epatch ${FILESDIR}/${P}_xim.patch
+	epatch ${FILESDIR}/anjuta-1.2.1.fix.cmp.usage.diff.gz
+	epatch ${FILESDIR}/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "Some project templates may require additional development"
+	einfo "libraries to function correctly. It goes beyond the scope"
+	einfo "of this ebuild to provide them."
+
+}
diff --git a/dev-util/anjuta/files/anjuta-1.2.1.fix.cmp.usage.diff.gz b/dev-util/anjuta/files/anjuta-1.2.1.fix.cmp.usage.diff.gz
new file mode 100644
index 000000000000..667b4291a439
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-1.2.1.fix.cmp.usage.diff.gz
diff --git a/dev-util/anjuta/files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz b/dev-util/anjuta/files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz
new file mode 100644
index 000000000000..96cd41884185
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz
diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.1-r1 b/dev-util/anjuta/files/digest-anjuta-1.2.1-r1
new file mode 100644
index 000000000000..a4ee3c2f7900
--- /dev/null
+++ b/dev-util/anjuta/files/digest-anjuta-1.2.1-r1
@@ -0,0 +1 @@
+MD5 f74a86d4541e0f55115be9de66d8c2c4 anjuta-1.2.1.tar.gz 8013051