New release: 0.31. Removing old ebuilds/patches.

(Portage version: 2.0.52-r1)

11 files changed, 61 insertions, 152 deletions

diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog
index 32f7a164617b..c9b299191582 100644
--- a/net-print/gnome-cups-manager/ChangeLog
+++ b/net-print/gnome-cups-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/gnome-cups-manager
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.48 2005/07/12 04:55:19 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.49 2005/09/27 20:44:41 leonardop Exp $
+
+*gnome-cups-manager-0.31 (27 Sep 2005)
+
+  27 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  files/gnome-cups-manager.desktop, +gnome-cups-manager-0.31.ebuild:
+  New version. Added DOCS variable. Updated dependencies. Fixed slight syntax
+  problem in .desktop file.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
   gnome-cups-manager-0.30.ebuild:
diff --git a/net-print/gnome-cups-manager/Manifest b/net-print/gnome-cups-manager/Manifest
index 2cca40cd004e..4508ca3fb758 100644
--- a/net-print/gnome-cups-manager/Manifest
+++ b/net-print/gnome-cups-manager/Manifest
@@ -1,11 +1,8 @@
-MD5 3299b93b298a3a453b0efa757af03d22 gnome-cups-manager-0.30.ebuild 799
-MD5 112f3c4c3da156b141c8f9b4198c0264 gnome-cups-manager-0.17.ebuild 869
 MD5 91072c27dd28e61fa19936cb4f44fff1 ChangeLog 6297
+MD5 36962df9c08f6f7fe263bb16ef7a05fa gnome-cups-manager-0.31.ebuild 808
+MD5 3299b93b298a3a453b0efa757af03d22 gnome-cups-manager-0.30.ebuild 799
+MD5 a7e12230f3dffdb040a0042ae27ad73f .gnome-cups-manager-0.31.ebuild.swp 12288
 MD5 574309004015c52c39e2f4e8122c18a3 metadata.xml 180
-MD5 5086d03b640bd8fdc2cf90ec37ce8c85 gnome-cups-manager-0.28.ebuild 800
-MD5 0c0cb642ffb64f6fb6374990ed754088 files/gnome-cups-manager.desktop 312
-MD5 6dae95b443777de3b98de444d36134ec files/digest-gnome-cups-manager-0.17 76
-MD5 07a029b527bbc920b1174bd5dff0f048 files/digest-gnome-cups-manager-0.28 76
+MD5 a09e276448487ea0a75559158222b9c8 files/digest-gnome-cups-manager-0.31 76
 MD5 998708b9d087d7d8f34f8dcf319fb4b3 files/digest-gnome-cups-manager-0.30 76
-MD5 38ef34fd59e1c024d719000653111039 files/gnome-cups-manager-0.17-fix_gtk24_deprecation.patch 3301
-MD5 1772dd481b0fa6e38d67b284f73df4bf files/gnome-cups-manager-0.18-paren.patch 486
+MD5 0c0cb642ffb64f6fb6374990ed754088 files/gnome-cups-manager.desktop 312
diff --git a/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.17 b/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.17
deleted file mode 100644
index f06692da65cd..000000000000
--- a/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1aa72f8318a7ccb795cdfd2676d6346c gnome-cups-manager-0.17.tar.bz2 316581
diff --git a/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.28 b/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.28
deleted file mode 100644
index a42c38e1e60c..000000000000
--- a/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bcb0649a53282fea52d730980aff552a gnome-cups-manager-0.28.tar.bz2 545853
diff --git a/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.31 b/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.31
new file mode 100644
index 000000000000..b17b85d72612
--- /dev/null
+++ b/net-print/gnome-cups-manager/files/digest-gnome-cups-manager-0.31
@@ -0,0 +1 @@
+MD5 4144b2cf05e381e89fed066793e3b249 gnome-cups-manager-0.31.tar.bz2 507851
diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.17-fix_gtk24_deprecation.patch b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.17-fix_gtk24_deprecation.patch
deleted file mode 100644
index 6afa3b5e4a90..000000000000
--- a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.17-fix_gtk24_deprecation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr gnome-cups-manager-0.17/gnome-cups-add/Makefile.am gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.am
---- gnome-cups-manager-0.17/gnome-cups-add/Makefile.am	2003-05-02 12:44:21.000000000 +0200
-+++ gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.am	2004-03-22 00:29:34.260671832 +0100
-@@ -9,9 +9,7 @@
- 	-DDATADIR=\""$(datadir)"\" \
- 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
- 	-DLIBDIR=\""$(libdir)"\" \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
--	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
--	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
-+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	
- 
- cupsmanagerdatadir=$(datadir)/gnome-cups-manager
- cupsmanagerdata_DATA=gnome-cups-add.glade
-@@ -39,4 +37,4 @@
- gnome_cups_add_LDFLAGS= $(GNOME_LIBS) \
- 	snmpkit/libsnmpkit.a ../libgnomecups/libgnomecupsui-1.0.la
- 
--EXTRA_DIST=gnome-cups-add.glade
-\ No newline at end of file
-+EXTRA_DIST=gnome-cups-add.glade
-diff -uNr gnome-cups-manager-0.17/gnome-cups-add/Makefile.in gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.in
---- gnome-cups-manager-0.17/gnome-cups-add/Makefile.in	2003-07-01 17:41:06.000000000 +0200
-+++ gnome-cups-manager-0.17.patched/gnome-cups-add/Makefile.in	2004-03-22 00:30:07.027690488 +0100
-@@ -129,10 +129,7 @@
- 	-DDATADIR=\""$(datadir)"\" \
- 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
- 	-DLIBDIR=\""$(libdir)"\" \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
--	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
--	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
--
-+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
- 
- cupsmanagerdatadir = $(datadir)/gnome-cups-manager
- cupsmanagerdata_DATA = gnome-cups-add.glade
-diff -uNr gnome-cups-manager-0.17/gnome-cups-manager/Makefile.am gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.am
---- gnome-cups-manager-0.17/gnome-cups-manager/Makefile.am	2003-07-01 17:16:48.000000000 +0200
-+++ gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.am	2004-03-22 00:29:58.571975952 +0100
-@@ -8,9 +8,7 @@
- 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
- 	-DGNOME_CUPS_MANAGER_PIXMAPDIR=\""$(datadir)/pixmaps/gnome-cups-manager"\" \
- 	-DLIBDIR=\""$(libdir)"\" \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
--	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
--	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
-+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
- 
- cupsmanagerdatadir=$(datadir)/gnome-cups-manager
- cupsmanagerdata_DATA=gnome-cups-manager.glade
-diff -uNr gnome-cups-manager-0.17/gnome-cups-manager/Makefile.in gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.in
---- gnome-cups-manager-0.17/gnome-cups-manager/Makefile.in	2003-07-01 17:41:07.000000000 +0200
-+++ gnome-cups-manager-0.17.patched/gnome-cups-manager/Makefile.in	2004-03-22 00:29:48.958437432 +0100
-@@ -128,9 +128,7 @@
- 	-DGNOME_CUPS_MANAGER_DATADIR=\""$(datadir)/gnome-cups-manager"\" \
- 	-DGNOME_CUPS_MANAGER_PIXMAPDIR=\""$(datadir)/pixmaps/gnome-cups-manager"\" \
- 	-DLIBDIR=\""$(libdir)"\" \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
--	-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED	\
--	-DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED
-+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
- 
- 
- cupsmanagerdatadir = $(datadir)/gnome-cups-manager
diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.18-paren.patch b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.18-paren.patch
deleted file mode 100644
index be3ca7c1be3b..000000000000
--- a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.18-paren.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-cups-add/snmpkit/snmpkit_interface.C.old	2004-06-09 00:02:09.333687136 -0400
-+++ gnome-cups-add/snmpkit/snmpkit_interface.C	2004-06-09 00:02:59.839009160 -0400
-@@ -508,7 +508,7 @@
- void **sk_table_get(SNMPTABLE *st){
-   std::list<void*> vals;
-   from_c(st)->get(vals);
--  void **retval=new (void*)[vals.size()+1];
-+  void **retval=new void*[vals.size()+1];
-   retval[vals.size()]=NULL;
-   int i=0;
-   for(std::list<void*>::iterator cur=vals.begin();cur!=vals.end();cur++,i++)
diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager.desktop b/net-print/gnome-cups-manager/files/gnome-cups-manager.desktop
index 9e57216bb521..1976c3878873 100644
--- a/net-print/gnome-cups-manager/files/gnome-cups-manager.desktop
+++ b/net-print/gnome-cups-manager/files/gnome-cups-manager.desktop
@@ -10,4 +10,4 @@ Icon=gnome-dev-printer
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=GNOME;Application;Settings;System
+Categories=GNOME;Application;Settings;System;
diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild
deleted file mode 100644
index 8db11b7b7443..000000000000
--- a/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.17.ebuild,v 1.23 2005/03/09 22:58:41 lanius Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME CUPS Printer Management Interface"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa ia64 amd64 mips arm"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	=net-print/libgnomecups-0.1*"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.20"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix gtk+-2.4 deprecation issues (#45259)
-	epatch ${FILESDIR}/${P}-fix_gtk24_deprecation.patch
-	# gcc 3.4 fix
-	epatch ${FILESDIR}/${PN}-0.18-paren.patch
-}
diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.28.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.28.ebuild
deleted file mode 100644
index 8a39f97edcd7..000000000000
--- a/net-print/gnome-cups-manager/gnome-cups-manager-0.28.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.28.ebuild,v 1.12 2005/04/25 06:26:51 kloeri Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME CUPS Printer Management Interface"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa ia64 amd64 arm ~mips"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	=net-print/libgnomecups-0.1.14
-	app-admin/gnomesu"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29"
-
-src_install() {
-	gnome2_src_install
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-}
diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.31.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.31.ebuild
new file mode 100644
index 000000000000..b0843c48a234
--- /dev/null
+++ b/net-print/gnome-cups-manager/gnome-cups-manager-0.31.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.31.ebuild,v 1.1 2005/09/27 20:44:41 leonardop Exp $
+
+inherit gnome2
+
+DESCRIPTION="GNOME CUPS Printer Management Interface"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+# See ChangeLog regarding libgnomeui
+RDEPEND=">=x11-libs/gtk+-2.3.1
+	>=dev-libs/glib-2.3.1
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonobo-2
+	>=net-print/libgnomecups-0.2.0
+	gnome-base/gnome-keyring
+
+	app-admin/gnomesu"
+
+DEPEND=">=x11-libs/gtk+-2.3.1
+	>=dev-libs/glib-2.3.1
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonobo-2
+	>=net-print/libgnomecups-0.2.0
+	gnome-base/gnome-keyring
+
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28"
+
+DOCS="ChangeLog NEWS README"
+
+
+src_install() {
+	gnome2_src_install
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
+}