bug fix 'n cleanup

5 files changed, 9 insertions, 42 deletions

diff --git a/x11-misc/goats/ChangeLog b/x11-misc/goats/ChangeLog
index 20b8cb24e30e..5d95edc4db2d 100644
--- a/x11-misc/goats/ChangeLog
+++ b/x11-misc/goats/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/goats
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/goats/ChangeLog,v 1.9 2004/06/24 22:20:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/goats/ChangeLog,v 1.10 2004/08/23 10:02:20 foser Exp $
+
+  23 Aug 2004; foser <foser@gentoo.org> goats-2.2.ebuild :
+  Fix gtk+-2.4 issue (#61303)
 
   20 Jun 2004; Ian Leitch <port001@gentoo.org> goats-2.0.ebuild,
   goats-2.2.ebuild:
diff --git a/x11-misc/goats/Manifest b/x11-misc/goats/Manifest
index c3eef3009336..6442f4d87864 100644
--- a/x11-misc/goats/Manifest
+++ b/x11-misc/goats/Manifest
@@ -1,6 +1,4 @@
-MD5 eb76a08b36852f1fe91e3ae7b4ff78a5 goats-2.0.ebuild 1019
-MD5 755ed0c58829c01a27ee8cbd2d1b3b5d goats-2.2.ebuild 765
-MD5 6de97c8c78efad78fa634cd916b51963 ChangeLog 1068
+MD5 4902590cde23ce473be2d0c63f107f6b goats-2.2.ebuild 834
+MD5 ba180c4946e56c6f0298d06826027e07 ChangeLog 1156
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 3ee3a12ad25d2beda5138e6976850746 files/digest-goats-2.0 61
 MD5 0018739b65061053ba46637f0e2d4a05 files/digest-goats-2.2 61
diff --git a/x11-misc/goats/files/digest-goats-2.0 b/x11-misc/goats/files/digest-goats-2.0
deleted file mode 100644
index d008f43c6f59..000000000000
--- a/x11-misc/goats/files/digest-goats-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53df288b1f2dd35addc1e55daf221419 goats-2.0.tar.gz 304547
diff --git a/x11-misc/goats/goats-2.0.ebuild b/x11-misc/goats/goats-2.0.ebuild
deleted file mode 100644
index 50a2f73b0389..000000000000
--- a/x11-misc/goats/goats-2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/goats/goats-2.0.ebuild,v 1.7 2004/06/24 22:20:23 agriffis Exp $
-
-inherit gnome2
-
-IUSE=""
-DESCRIPTION="Goats is a yellow post-it note applet for the Gnome2 Desktop"
-SRC_URI="http://www.menudo.freeserve.co.uk/${P}.tar.gz"
-HOMEPAGE="http://www.menudo.freeserve.co.uk/goats.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-RDEPEND=">=x11-libs/pango-1.0.4-r1
-	>=x11-libs/gtk+-2.0.6-r1
-	>=dev-libs/glib-2.0.6-r1
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/gnome-vfs-2.0.2
-	>=gnome-base/libglade-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/gnome-panel-2.0.6
-	>=gnome-base/libbonoboui-2.0.0
-	>=gnome-base/libgnomecanvas-2.0.0
-	>=dev-libs/libxml2-2.4.23
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	<gnome-base/libgnomeprintui-2"
-
-DOCS="ABOUT-NLS AUTHORS BUGS ChangeLog COPYING README TODO"
diff --git a/x11-misc/goats/goats-2.2.ebuild b/x11-misc/goats/goats-2.2.ebuild
index 297330dfb9ab..b11538c32685 100644
--- a/x11-misc/goats/goats-2.2.ebuild
+++ b/x11-misc/goats/goats-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/goats/goats-2.2.ebuild,v 1.8 2004/06/24 22:20:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/goats/goats-2.2.ebuild,v 1.9 2004/08/23 10:02:20 foser Exp $
 
 inherit gnome2
 
@@ -24,3 +24,5 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21"
 
 DOCS="ABOUT-NLS AUTHORS BUGS ChangeLog NEWS COPYING README TODO"
+
+CFLAGS="${CFLAGS} -UGTK_DISABLE_DEPRECATED -UGNOME_DISABLE_DEPRECATED"