Clean up old revisions.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 7 insertions, 202 deletions

diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog
index 931d98290937..1a23a73ba6e9 100644
--- a/net-print/gnome-cups-manager/ChangeLog
+++ b/net-print/gnome-cups-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/gnome-cups-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.93 2010/01/18 00:30:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.94 2010/04/12 20:49:09 eva Exp $
+
+  12 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-cups-manager-0.31-r2.ebuild,
+  -files/gnome-cups-manager-0.31+gcc-4.3.patch,
+  -gnome-cups-manager-0.33.ebuild, -files/gnome-cups-manager.desktop:
+  Clean up old revisions.
 
   18 Jan 2010; Jeroen Roovers <jer@gentoo.org>
   gnome-cups-manager-0.33-r1.ebuild:
diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.31+gcc-4.3.patch b/net-print/gnome-cups-manager/files/gnome-cups-manager-0.31+gcc-4.3.patch
deleted file mode 100644
index 37c7d7f8aca0..000000000000
--- a/net-print/gnome-cups-manager/files/gnome-cups-manager-0.31+gcc-4.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: gnome-cups-manager-0.31/libgnomecups/snmpkit/snmpkit
-===================================================================
---- gnome-cups-manager-0.31.orig/libgnomecups/snmpkit/snmpkit
-+++ gnome-cups-manager-0.31/libgnomecups/snmpkit/snmpkit
-@@ -31,6 +31,7 @@
- #include <netdb.h>
- #include <pthread.h>
- 
-+#include <cstring>
- #include <string>
- #include <list>
- #include <functional>
-Index: gnome-cups-manager-0.31/libgnomecups/snmpkit/structfill.C
-===================================================================
---- gnome-cups-manager-0.31.orig/libgnomecups/snmpkit/structfill.C
-+++ gnome-cups-manager-0.31/libgnomecups/snmpkit/structfill.C
-@@ -28,7 +28,8 @@
- #include <string.h>
- #include <stdlib.h>
- #include <stdio.h>
--#include <iostream.h>
-+#include <iostream>
-+#include <ios>
- #include <algorithm>
- 
- #include "snmpkit"
-@@ -91,22 +92,22 @@ int SNMP_structFiller::fillStruct(OidSeq
- 	 counters or large ints */
-       if(curber->type()==INT_TAG && cur->type==COUNTER_TAG)
- 	// these errors are minor enough and simple enough to fix
--	cerr << "Warning: Counter returned when Integer expected for " 
-+	std::cerr << "Warning: Counter returned when Integer expected for " 
- 	     << cur->oidstr << " Buggy firmware?\n";
-       else if(curber->type()==COUNTER_TAG && cur->type==INT_TAG)
- 	// these errors are minor enough and simple enough to fix
--	cerr << "Warning: Integer returned when Counter expected for "
-+	std::cerr << "Warning: Integer returned when Counter expected for "
- 	     << cur->oidstr << " Buggy firmware?\n";
-       else{
--	ios::fmtflags opts=ios::hex;
--	opts=cerr.flags(opts);
--	cerr << "Warning: Printer returned a value of type 0x"
-+	std::ios::fmtflags opts=std::ios::hex;
-+	opts=std::cerr.flags(opts);
-+        std::cerr << "Warning: Printer returned a value of type 0x"
- 	     << static_cast<long unsigned int>(curber->type()) 
- 	     << " when a value of 0x" 
- 	     << static_cast<long unsigned int>(cur->type)
- 	     << " was expected for " << cur->oidstr 
- 	     << " Buggy firmware? Skipping.\n";
--	cerr.flags(opts);
-+	std::cerr.flags(opts);
- 	retval=0;
- 	break;
-       }
-@@ -177,7 +178,7 @@ void *SNMP_structFiller::get(void *tobef
-     throw SNMPNoResponseException();
- 
-   if(!fillStruct(retseq,(unsigned char*)tobefilled)){
--    cerr << "Warning: printer did not respond with a value for one of the "
-+    std::cerr << "Warning: printer did not respond with a value for one of the "
- 	 << "OIDs. Buggy firmware?\n";
-     return NULL;
-   }
diff --git a/net-print/gnome-cups-manager/files/gnome-cups-manager.desktop b/net-print/gnome-cups-manager/files/gnome-cups-manager.desktop
deleted file mode 100644
index 1976c3878873..000000000000
--- a/net-print/gnome-cups-manager/files/gnome-cups-manager.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Printing
-Name[de]=Drucker
-Name[fr]=Impression
-Comment=Configure your printers
-Comment[de]=Drucker einrichten
-Comment[fr]=Configurer vos imprimantes
-Exec=gnome-cups-manager
-Icon=gnome-dev-printer
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;Application;Settings;System;
diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r2.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r2.ebuild
deleted file mode 100644
index 7d3ca6902db8..000000000000
--- a/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 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-r2.ebuild,v 1.16 2008/06/09 13:05:14 flameeyes Exp $
-
-inherit eutils gnome2 flag-o-matic
-
-DESCRIPTION="GNOME CUPS Printer Management Interface"
-HOMEPAGE="http://www.gnome.org/"
-
-#
-# Please ensure that gcc-3.4 is stable on the arch before moving this to stable.
-#
-SRC_URI="${SRC_URI}
-	http://archive.ubuntu.com/ubuntu/pool/main/g/gnome-cups-manager/gnome-cups-manager_0.31-1.1ubuntu14.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-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
-	x11-libs/gksu"
-
-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_unpack() {
-	gnome2_src_unpack
-	# exclude ubuntu branding
-	mkdir ${WORKDIR}/ubuntu
-	cd ${WORKDIR}/ubuntu
-	cp -r ${S}/{po,ChangeLog,gnome-cups-manager} .
-	# Remove the ubuntu functions that require external
-	# scripts fixing bug 147972 (removes LAN browsing detection)
-	sed -i \
-		-e '/^---.*ui_browse_share_ctl.patch/,/^---/{/^---.*ui_browse_share_ctl.patch/!d;}' \
-		${WORKDIR}/gnome-cups-manager_0.31-1.1ubuntu14.diff
-	epatch ${WORKDIR}/gnome-cups-manager_0.31-1.1ubuntu14.diff
-	# gksudo does not always work
-	sed -i "s:gksudo:gksu:" debian/patches/change-su-command.patch
-	cd ${S}
-	epatch ${WORKDIR}/ubuntu/debian/patches/*
-
-	epatch "${FILESDIR}"/${P}+gcc-4.3.patch
-
-	# bug 141929
-	use amd64 && replace-flags -O* -O0
-}
-
-src_install() {
-	gnome2_src_install
-	cd ${WORKDIR}/ubuntu/debian
-	doman gnome-cups-icon.1 gnome-cups-manager.1 gnome-cups-add.8
-	domenu gnome-cups-manager.desktop
-}
diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.33.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.33.ebuild
deleted file mode 100644
index fa498db6dbdf..000000000000
--- a/net-print/gnome-cups-manager/gnome-cups-manager-0.33.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 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.33.ebuild,v 1.11 2009/04/14 11:54:15 armin76 Exp $
-
-inherit eutils gnome2 flag-o-matic
-
-DESCRIPTION="GNOME CUPS Printer Management Interface"
-HOMEPAGE="http://www.gnome.org/"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-COMMON=">=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.3
-	gnome-base/gnome-keyring"
-
-RDEPEND="${COMMON}
-	x11-libs/gksu"
-
-DEPEND="${COMMON}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28"
-
-DOCS="ChangeLog NEWS README"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	rm "${WORKDIR}"/patches/140_all_ui_tooltip.patch || \
-		die "removing patch failed"
-
-	export	EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		EPATCH_MULTI_MSG="Applying Ubuntu patches (enhancements) ..."
-	epatch
-}
-
-src_install() {
-	gnome2_src_install
-	#Debian-specific.
-	rm "${D}"/usr/sbin/gnome-cups-switch
-}