New version, culled older versions

9 files changed, 13 insertions, 85 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index 16bc2f31e4b1..0046a04ed60a 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.38 2004/11/12 10:18:31 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.39 2004/11/24 17:30:57 obz Exp $
+
+*zenity-2.8.1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> -zenity-1.6.ebuild,
+  -zenity-2.6.0.ebuild, -zenity-2.6.3.ebuild, +zenity-2.8.1.ebuild:
+  New version, culled older versions
 
   12 Nov 2004; Mike Gardiner <obz@gentoo.org> zenity-2.8.0.ebuild:
   Keyworded ppc for GNOME 2.8
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 0a5b8b7db097..0d546e420895 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,16 +1,12 @@
-MD5 c55f99c6c945c620128b66c24618f35d zenity-1.6.ebuild 924
 MD5 4cef76fa0916de2e71deebf3bc2c79c1 zenity-1.8.ebuild 872
 MD5 3d80b2dd817da108b268a020541c715f zenity-2.8.0.ebuild 863
-MD5 1823f114251219caa5e1a551e36e2f34 zenity-2.6.3.ebuild 907
-MD5 5eb47aea57471959dcefbf4086e1a28f zenity-2.6.0.ebuild 862
-MD5 f8d158d847d43ceff859e1890c77ed04 ChangeLog 4157
+MD5 dfeed2d1eb73921aaec10f7fe633fa38 ChangeLog 4358
+MD5 b6a6d547d426d8af0298e812f9bd802a zenity-2.8.1.ebuild 850
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9a61f47002cda7375a4bec79b61d71ae zenity-2.6.2.ebuild 862
 MD5 11d6827a445afb68eb58138ba36167b6 files/zenity-1.8-utf8_fix.patch 716
-MD5 89ba639461ca9877c61bfa6081598823 files/digest-zenity-1.6 63
 MD5 ef2defe06ca23b8e19247b646df39600 files/digest-zenity-1.8 63
 MD5 0308ff19f6b68370739997806d23f4ac files/zenity-2.6.3-utf8_fix.patch 569
-MD5 f08c33f7bc51d593798edbb8423c0378 files/digest-zenity-2.6.0 65
 MD5 8eec88827b7869265ff7ccf4f537af39 files/digest-zenity-2.6.2 65
-MD5 44e87d13530f4bc8ab52c7588cb8a91d files/digest-zenity-2.6.3 65
 MD5 8bac9e3129dedd022b99ba45d50d3d36 files/digest-zenity-2.8.0 65
+MD5 8cde25f5e681088600fca7bb788465e7 files/digest-zenity-2.8.1 65
diff --git a/gnome-extra/zenity/files/digest-zenity-1.6 b/gnome-extra/zenity/files/digest-zenity-1.6
deleted file mode 100644
index 4086056f2a38..000000000000
--- a/gnome-extra/zenity/files/digest-zenity-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edba02f625368eb993fcce385149c09c zenity-1.6.tar.bz2 417606
diff --git a/gnome-extra/zenity/files/digest-zenity-2.6.0 b/gnome-extra/zenity/files/digest-zenity-2.6.0
deleted file mode 100644
index 534e6806d0e0..000000000000
--- a/gnome-extra/zenity/files/digest-zenity-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4799af349c692f6a421d751711a81331 zenity-2.6.0.tar.bz2 611617
diff --git a/gnome-extra/zenity/files/digest-zenity-2.6.3 b/gnome-extra/zenity/files/digest-zenity-2.6.3
deleted file mode 100644
index 61b4723ee93b..000000000000
--- a/gnome-extra/zenity/files/digest-zenity-2.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce6678c406e9a834e4da04ca00338931 zenity-2.6.3.tar.bz2 650351
diff --git a/gnome-extra/zenity/files/digest-zenity-2.8.1 b/gnome-extra/zenity/files/digest-zenity-2.8.1
new file mode 100644
index 000000000000..2fd2a34c968e
--- /dev/null
+++ b/gnome-extra/zenity/files/digest-zenity-2.8.1
@@ -0,0 +1 @@
+MD5 a566a88b88c8f530939e900539cb8d28 zenity-2.8.1.tar.bz2 731091
diff --git a/gnome-extra/zenity/zenity-1.6.ebuild b/gnome-extra/zenity/zenity-1.6.ebuild
deleted file mode 100644
index fb772d9ff954..000000000000
--- a/gnome-extra/zenity/zenity-1.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-1.6.ebuild,v 1.15 2004/06/24 22:11:17 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="commandline dialog tool for gnome"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomecanvas-2
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README THANKS TODO"
-
-src_compile() {
-	gnome2_src_configure "$@"
-	# Fix bug which breaks compilation with some CFLAGS and compiler
-	# combinations.  See bug 28664 for more information
-	echo '#include <locale.h>' >> config.h
-	emake || die "compile failure"
-}
diff --git a/gnome-extra/zenity/zenity-2.6.0.ebuild b/gnome-extra/zenity/zenity-2.6.0.ebuild
deleted file mode 100644
index 402a110fbccb..000000000000
--- a/gnome-extra/zenity/zenity-2.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.6.0.ebuild,v 1.9 2004/07/04 19:33:11 kloeri Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="commandline dialog tool for gnome"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.3.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README THANKS TODO"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# Don't set the UTF-8 codeset before parsing command line arguments.
-	# Closes bug #45204.
-	epatch ${FILESDIR}/${PN}-1.8-utf8_fix.patch
-
-}
-
diff --git a/gnome-extra/zenity/zenity-2.6.3.ebuild b/gnome-extra/zenity/zenity-2.8.1.ebuild
index 073f3c47bd4d..bd27a252b736 100644
--- a/gnome-extra/zenity/zenity-2.6.3.ebuild
+++ b/gnome-extra/zenity/zenity-2.8.1.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/gnome-extra/zenity/zenity-2.6.3.ebuild,v 1.1 2004/09/13 16:29:42 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.8.1.ebuild,v 1.1 2004/11/24 17:30:57 obz Exp $
 
 inherit gnome2 eutils
 
@@ -30,8 +30,6 @@ src_unpack() {
 	cd ${S}
 	# Don't set the UTF-8 codeset before parsing command line arguments.
 	# Closes bug #45204.
-	# Slightly altered for 2.6.3, removed the obsolete first hunk
-	epatch ${FILESDIR}/${P}-utf8_fix.patch
+	epatch ${FILESDIR}/${PN}-2.6.3-utf8_fix.patch
 
 }
-