From 242ebaf5597508e5b9b847c0190eddee32b9eedb Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 12 Apr 2010 20:49:09 +0000 Subject: [PATCH] Clean up old revisions. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- net-print/gnome-cups-manager/ChangeLog | 8 +- net-print/gnome-cups-manager/Manifest | 19 +++-- .../gnome-cups-manager-0.31+gcc-4.3.patch | 64 ---------------- .../files/gnome-cups-manager.desktop | 13 ---- .../gnome-cups-manager-0.31-r2.ebuild | 73 ------------------- .../gnome-cups-manager-0.33.ebuild | 51 ------------- 6 files changed, 18 insertions(+), 210 deletions(-) delete mode 100644 net-print/gnome-cups-manager/files/gnome-cups-manager-0.31+gcc-4.3.patch delete mode 100644 net-print/gnome-cups-manager/files/gnome-cups-manager.desktop delete mode 100644 net-print/gnome-cups-manager/gnome-cups-manager-0.31-r2.ebuild delete mode 100644 net-print/gnome-cups-manager/gnome-cups-manager-0.33.ebuild 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 + -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 gnome-cups-manager-0.33-r1.ebuild: diff --git a/net-print/gnome-cups-manager/Manifest b/net-print/gnome-cups-manager/Manifest index 3d56b22d866b..60a1221bec0a 100644 --- a/net-print/gnome-cups-manager/Manifest +++ b/net-print/gnome-cups-manager/Manifest @@ -1,12 +1,15 @@ -AUX gnome-cups-manager-0.31+gcc-4.3.patch 2481 RMD160 355d501b9de3d4ba0011ffbb9722c6bbd2e295b9 SHA1 c6a887a3df65813639b1623be9eae67dc85bddc8 SHA256 f295c8fe6ed6f25d49be889989a233af7d135ff361a71607d08e81a125494ec2 -AUX gnome-cups-manager.desktop 313 RMD160 d3b200d93c454c9a59e23c59610f68e047be6eab SHA1 45f87cb6d09739ade0f9e2228621672da5dd65eb SHA256 972bb844f9317cc5bc64c86d0799903df695d75290518cf925343f0924df33fd -DIST gnome-cups-manager-0.31.tar.bz2 507851 RMD160 4dfaaa301ab043e2f1806b2d339169109d56f9b5 SHA1 4516f6e810dce5548e95a0464b0f7abec9d8ae1a SHA256 8ccfd3816757fa8127cf96a530e374c81a449fbcd9391d2d3e1bac29f54ab3e6 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST gnome-cups-manager-0.33.tar.bz2 600222 RMD160 d116909407d3a96375bb3ab4213e7fe9e8d372c1 SHA1 1efe69b33d25569d9f1f5010e25a248680d0751f SHA256 9d4fdefc8f69c0e1b330bb399b162f1f1005afdadf346e4f5d739de75c660dca DIST gnome-cups-manager-patches-0.33-r1.tar.bz2 15832 RMD160 2d04d26b0e553344ab3105ada8169fb8b9878063 SHA1 46556de2f82b3dfd4b39bb014c83203349d41fde SHA256 4735aa74391433fa45ca1a9ccab7bd9c8e8b23ea797de0fec34d77eb569dceb1 -DIST gnome-cups-manager-patches-0.33.tar.bz2 15785 RMD160 e0b9586a6dce6feb4f8f3ca1f8e2fd33f5870859 SHA1 719e0c9b773bf326c94754ee989c3ba796dce971 SHA256 9467870827e3eb50f6a0909fe7edd3b6045e5eacc8f58f5b8e2198ddb75f1241 -DIST gnome-cups-manager_0.31-1.1ubuntu14.diff.gz 387348 RMD160 cb476338989e257f6f57daab74414a3b87627690 SHA1 d8f20a7c4a7cb6e5c480a4064aa33d1ce8fce98a SHA256 d89dbe9b398265ea7a7c0b72f705b31aac957a822e56f80cc65baafa4b9d8993 -EBUILD gnome-cups-manager-0.31-r2.ebuild 2155 RMD160 7003877892bb85795319c477d2872d62a0b0acc5 SHA1 f4ba1824e282361f1a948d100a737631e2a85bde SHA256 d7cdec4b94f4d59149d32ab8b66c1d69cfc2e062fd008760b131aa651827a13b EBUILD gnome-cups-manager-0.33-r1.ebuild 1255 RMD160 563a797c90a9e1f7aefbcf6473d93308ee770de7 SHA1 153f0d2e7692e2242fa5e30ae641cc4ad4ba63f4 SHA256 9326f7000bbc762cbacc3d2efed00e1b2dfc4a5d3459dd3e8050df71163fc305 -EBUILD gnome-cups-manager-0.33.ebuild 1256 RMD160 c41463f6c3c2829792ed439305f2e97a3e9f6fd6 SHA1 eb894472489e726494bbcfbb831a284bb7b93ba4 SHA256 c70c1e9bae5949b1f02a7075a800f80275c4b2fc13d68e711a5d3f67b9bddea7 -MISC ChangeLog 12576 RMD160 084e1e8b7dc9980adef91205d896bd02e5e0490a SHA1 3eed5052cca70edbe539d3ca38b0832b76932074 SHA256 1c9fafd43047d29af05d7a4e5a30e339eeb3c217fa11a87c16e73ffc22655e74 +MISC ChangeLog 12813 RMD160 52b9dd72e6821df76f05e4cddd0cbf6ae4db04be SHA1 0e5e1bb02fd465f219db18fa41d74df43d8c9ed0 SHA256 3aa2962e0ad94ea99e4c05e7b1eb649f6781709562a0c9d9843d653b74500291 MISC metadata.xml 180 RMD160 082aa46c6fe033d8548d5351c7073d98a11e952b SHA1 f006fd73fec1f95de0831e1d942d6078620fe43f SHA256 21576b6f9d195cfd7a7f38ef661ffad9e39e979c1c98c9af12ce85398fc133a9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvDh0sACgkQ1fmVwcYIWAYqLwCg2AnEzp6IIzGglqxcqE169IAd +GkEAoJopxccPIpLLWQ4DTS2088ECMLM9 +=UP7G +-----END PGP SIGNATURE----- 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 - #include - -+#include - #include - #include - #include -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 - #include - #include --#include -+#include -+#include - #include - - #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(curber->type()) - << " when a value of 0x" - << static_cast(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 -} -- 2.26.2