Fix bug 147972 by removing the non working parts of the patch thanks to Greg Watson...

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/net-print/gnome-cups-manager/ChangeLog b/net-print/gnome-cups-manager/ChangeLog
index 2e7c3f7a1aa0a50905f0e7361a16ac59b44ea3cb..08e7d63b08a014cdee3c07b3cda7d2181085a936 100644 (file)
--- a/net-print/gnome-cups-manager/ChangeLog
+++ b/net-print/gnome-cups-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/gnome-cups-manager
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.56 2006/11/02 07:07:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/ChangeLog,v 1.57 2006/11/16 21:45:42 genstef Exp $
+
+  16 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+  gnome-cups-manager-0.31-r1.ebuild:
+  Fix bug 147972 by removing the non working parts of the patch thanks to Greg
+  Watson (linuxkrn)
 
   02 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
   gnome-cups-manager-0.31-r1.ebuild:

diff --git a/net-print/gnome-cups-manager/Manifest b/net-print/gnome-cups-manager/Manifest
index 6794d479bbc47a8ef11c41f73f0897689e1d6fb0..b8780c1822e93591522d73a6e82c19d2b1542e2f 100644 (file)
--- a/net-print/gnome-cups-manager/Manifest
+++ b/net-print/gnome-cups-manager/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-cups-manager.desktop 313 RMD160 d3b200d93c454c9a59e23c59610f68e047be6eab SHA1 45f87cb6d09739ade0f9e2228621672da5dd65eb SHA256 972bb844f9317cc5bc64c86d0799903df695d75290518cf925343f0924df33fd
 MD5 4a5b7a95a2dab91d403eab46700c0e87 files/gnome-cups-manager.desktop 313
 RMD160 d3b200d93c454c9a59e23c59610f68e047be6eab files/gnome-cups-manager.desktop 313
@@ -12,18 +9,18 @@ EBUILD gnome-cups-manager-0.30.ebuild 894 RMD160 775974bdb9b8424f86642af105e8577
 MD5 cf99fca3122a87ef1f6a2414f7c2e2a8 gnome-cups-manager-0.30.ebuild 894
 RMD160 775974bdb9b8424f86642af105e85775f5d9625a gnome-cups-manager-0.30.ebuild 894
 SHA256 9cd3afa2fc2163d76750d671ed3d3f1d847311c07cb4c0e02ffbfe19ca1e4d1c gnome-cups-manager-0.30.ebuild 894
-EBUILD gnome-cups-manager-0.31-r1.ebuild 1831 RMD160 6805ae1838b8ae4e1c5a29efd564400bd13d7428 SHA1 a17280099618e141a8e6da3f749b1af1591ef532 SHA256 133c54f05afaf5937c7a11b72287d3c7d53c7aac428e02a39786d4618a2188e8
-MD5 12488b035cc983724fc975c34bcb0e93 gnome-cups-manager-0.31-r1.ebuild 1831
-RMD160 6805ae1838b8ae4e1c5a29efd564400bd13d7428 gnome-cups-manager-0.31-r1.ebuild 1831
-SHA256 133c54f05afaf5937c7a11b72287d3c7d53c7aac428e02a39786d4618a2188e8 gnome-cups-manager-0.31-r1.ebuild 1831
+EBUILD gnome-cups-manager-0.31-r1.ebuild 2100 RMD160 e3477c8b110fdb573de8f7f143d363c5b1dd2cf4 SHA1 c313a03f43b5351037c06c13405a948691dbf6e1 SHA256 838cbf70b58659cedf27b4b0ed680a000c1cb0dac49b7778a4f9c32980a99323
+MD5 d6643cacb5f3949eb47fda3c5eb775d4 gnome-cups-manager-0.31-r1.ebuild 2100
+RMD160 e3477c8b110fdb573de8f7f143d363c5b1dd2cf4 gnome-cups-manager-0.31-r1.ebuild 2100
+SHA256 838cbf70b58659cedf27b4b0ed680a000c1cb0dac49b7778a4f9c32980a99323 gnome-cups-manager-0.31-r1.ebuild 2100
 EBUILD gnome-cups-manager-0.31.ebuild 1307 RMD160 ddbba332f1c432ab3c326b9ecd08208675450bc1 SHA1 f0b324e89a8a7ac5c712589d30114f95cb3296eb SHA256 f351ff3902d3658f80fc890cb384bdf2275a384b74fd7c545c9298ea5253f596
 MD5 48137bfc45f2b2e91b682e1184e5975e gnome-cups-manager-0.31.ebuild 1307
 RMD160 ddbba332f1c432ab3c326b9ecd08208675450bc1 gnome-cups-manager-0.31.ebuild 1307
 SHA256 f351ff3902d3658f80fc890cb384bdf2275a384b74fd7c545c9298ea5253f596 gnome-cups-manager-0.31.ebuild 1307
-MISC ChangeLog 7731 RMD160 68361b8629c5c4d53cf3f8a17528a6ef02fefdb1 SHA1 c018acd2901e28e9925cde7ef194eab7e8640cd5 SHA256 5830463a70cadd700cf2712ce875d9bf09d0485177134f82af4ccc0137002e39
-MD5 dc3a03cdb6644c86a0726ea5f534fca7 ChangeLog 7731
-RMD160 68361b8629c5c4d53cf3f8a17528a6ef02fefdb1 ChangeLog 7731
-SHA256 5830463a70cadd700cf2712ce875d9bf09d0485177134f82af4ccc0137002e39 ChangeLog 7731
+MISC ChangeLog 7921 RMD160 602468b9ca1ed8b1a55f57f755262c81e2bbccbe SHA1 745918140bf7c42d6e4dad2cd75d9de0a6cac200 SHA256 bd95dd8a8bce27dbe3702a5f173ec11e238b95c9e1600e31e4c39753c3bebf69
+MD5 0e4fe61d61255590706d0b5971c6dae2 ChangeLog 7921
+RMD160 602468b9ca1ed8b1a55f57f755262c81e2bbccbe ChangeLog 7921
+SHA256 bd95dd8a8bce27dbe3702a5f173ec11e238b95c9e1600e31e4c39753c3bebf69 ChangeLog 7921
 MISC metadata.xml 180 RMD160 082aa46c6fe033d8548d5351c7073d98a11e952b SHA1 f006fd73fec1f95de0831e1d942d6078620fe43f SHA256 21576b6f9d195cfd7a7f38ef661ffad9e39e979c1c98c9af12ce85398fc133a9
 MD5 574309004015c52c39e2f4e8122c18a3 metadata.xml 180
 RMD160 082aa46c6fe033d8548d5351c7073d98a11e952b metadata.xml 180
@@ -37,10 +34,3 @@ SHA256 27b28cccfbefbb24b491bb522cf005d476a784bdee1e1339dcfffff5fb53b404 files/di
 MD5 2be6fa81ea7e472d7fc8b295e8951e48 files/digest-gnome-cups-manager-0.31-r1 584
 RMD160 adf243ffd021f92532aee5b1ba4354164169d8e6 files/digest-gnome-cups-manager-0.31-r1 584
 SHA256 de98f8fd36f6db920763f8e2776d7011bab005158fd052234bc35b050e25c198 files/digest-gnome-cups-manager-0.31-r1 584
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFVqkFamhnQswr0vIRAv8AAKCtFRl9DCpc7YIWkdtOqTXAWAXJmQCfcsLI
-PdqtQuP4Y39P8wf8FfPquRQ=
-=1d3W
------END PGP SIGNATURE-----

diff --git a/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild b/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild
index 8c8b9b14585ea811405a455c59c78d7eaaa6411e..82d8b7ee2b3065c4a1f7054ac8ffe378b6b2b898 100644 (file)
--- a/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild
+++ b/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r1.ebuild,v 1.5 2006/11/12 04:54:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gnome-cups-manager/gnome-cups-manager-0.31-r1.ebuild,v 1.6 2006/11/16 21:45:42 genstef Exp $
 
 inherit eutils gnome2 flag-o-matic
 
@@ -49,6 +49,11 @@ src_unpack() {
        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