old

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog
index df10baa062f2d75975fd5ff4a5beb12d4c8c04f7..6a02958abce8e1347a5711583e6b0634150ae111 100644 (file)
--- a/net-print/xpp/ChangeLog
+++ b/net-print/xpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/xpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.24 2011/12/10 14:10:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.25 2011/12/10 14:12:17 ssuominen Exp $
+
+  10 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -files/cups.diff,
+  -files/inputslider.h.patch:
+  old
 
 *xpp-1.5-r1 (10 Dec 2011)
 

diff --git a/net-print/xpp/Manifest b/net-print/xpp/Manifest
index 807212a7928b9be10d9affcb4535924d52e5790b..fa0f5510c506003d6c4a6a4d1c2ed0ea6030714f 100644 (file)
--- a/net-print/xpp/Manifest
+++ b/net-print/xpp/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cups.diff 1254 RMD160 9ea69ce980bc1734ecbfabb9ffb6561d742291f2 SHA1 f30caaf6bf822655070dbeed604ca5faae9aee11 SHA256 4f15d4d53af3b10f889a196503e6c013dc01f93662bd1958e46ef0d7b71a788f
-AUX inputslider.h.patch 622 RMD160 77f0ced592ddf6d77d806ffe1b8f87cd5339d47b SHA1 b823be889c91271012062e31cd1f55e895e407af SHA256 4a8babc92dc06d5aca33b4267c95b7e5cf5b83133a3d85744ce512836aa0dfd3
 AUX xpp-fltk-1.3.0.patch 1012 RMD160 90812a8730e9e2a8615bbdc6e06c5e4eb8c09b4a SHA1 0bdf8f60bfe4f68966f20d3a1d9bd4f59015e9f7 SHA256 b63c4a9a7302cb9e1e62edaf028ef1e225a6ac49f2de801808f57dedc1ccbbb7
 AUX xpp-gcc4.patch 495 RMD160 8ec96cb332954380a3040915a6748311ad6c0d7c SHA1 ecf24161a4b276f7fc36e88610be5351bf06360d SHA256 0a3af70845f496e929537d2ebe011291e98d34b15bc90d6b09d9920e6ec06267
 AUX xpp-glibc-2.10.patch 368 RMD160 3327f4c12d525f5857cc67327d34f73c38e3f641 SHA1 e186e630873fb15a032572d61e20294e6175bd10 SHA256 072349dca84c0c956235e4f8c5d78d579da94be1dbdf2ea4a37bb2b9335b96ae
 DIST xpp-1.5.tar.gz 107755 RMD160 a64ec4c93013d1db08a6c9b6705b43850c36c337 SHA1 7f3c1427979516e47402a0acb708eb83b68daa61 SHA256 4d5b0c5467b10ababa4304c2fabf3f8cc7b715cc6a6a4844dc735bd7678a845d
 EBUILD xpp-1.5-r1.ebuild 987 RMD160 5fdb1089dcfc4e8c3a00f087ab98ec8245acce38 SHA1 c7a21008e0e3dd8114fd03503b883b318a136023 SHA256 2c8160c24dbddb636903e8b4f3dd492b3ce841600fbe5666d712ccda67d9e8da
-EBUILD xpp-1.5.ebuild 953 RMD160 b5ed28fb210c937693e04fbef29f15a52b1e25b6 SHA1 675b08b99f40e08b3523b569090dde416e151b7e SHA256 3d7e815e2a7ef0ee13cf95e874b11dd8f0bdbc7f5f3aa0ff668ba4be686ba76c
-MISC ChangeLog 3464 RMD160 74199eed316bf578082edbf34cf815a04bd5626a SHA1 569063f3cbfe0cc3f75aee115b970ec2967bea0f SHA256 99eb66876ad8a292a1f50a32665f1a8e19b5bc2051e409aa3cf6c1270e0afffa
+EBUILD xpp-1.5.ebuild 960 RMD160 1da6286ac14c16bbe510b9b36b8f0362ef0fb43e SHA1 ae4823863c1459142690d2a9fa8c3e7c631b81b8 SHA256 f416d73187680baca99184a97bc98a394c1539416cd038d6d099a0933950bc5c
+MISC ChangeLog 3573 RMD160 4d54239b4e60a2b2335da7e1456402a442e6faf2 SHA1 a8d73b17724831927eca635963cb5d9a4451f4f0 SHA256 079bc4319977501b929f4b7ea55234cd9e9a6a6811a5c80155393209b9f3afd9
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO42hKAAoJEEdUh39IaPFNMv4H/0ncQ/wzVkt1QgZF3fQVnNuc
-3sbFoKIOxyi0fKMOL8PHvoy7RCXfWM2Iqsc83GzCmfC7zLTNqFC+Mm86vsppxt2d
-dsF3g0lqh5JYmVVnChm3mrADgMvTy6+6G/6r6kVAgKRiqDeBUyFDKPRb2XZK9kZH
-3Fm3uy/dfi3YfM56HO9pw+Npl66Nim1VrFJ7WckNNYPlrYzrKcOPKU66aXs14aSk
-H3oeFwcjUKKzbv1PdlSjCpxcYKwwfk+Bywp8O3oy+ElVp937/N0nWUObrOxQ5tYj
-Xa6eE0o5yMxeZLxOiRrFtUDZh/tgnoMQ3xAwoAEGUxQU4cBwRcsegci2I2PUYsQ=
-=Hhxo
+iQEcBAEBAgAGBQJO42ieAAoJEEdUh39IaPFNqA4H/1K/CVbR113POggaCOntoZj9
+VeehP9mSTfXw745XGULsOeZ9DnwVkoIYzS2USgLROgt5ZJTLKDfQE/BcHmbd19EI
+hcVooTk16I2EwcLo5NHlYY7DLOimdvbjvD3axcBeaZtEkI6FQ5wbkFO4/xJrrNP7
+OnotbSl9RAN0kCbatkzbmPTalIn5nWeCIURtiLOzDyAVAEWHNVMIIgba1qS4O5LI
+36BJJXI0mrzW4BV+On73mevN85p8knKuuwsKDhq/HWREpt5rudPTasOgngPfW9lt
+pgaPNH0le+pDyGotXWDmPsTlgp7CrNg6JnOVgjdmcap1bxjeKvCcy1/568jYe8w=
+=Lskb
 -----END PGP SIGNATURE-----

diff --git a/net-print/xpp/files/cups.diff b/net-print/xpp/files/cups.diff
deleted file mode 100644 (file)
index dae3951..0000000
--- a/net-print/xpp/files/cups.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN xpp-1.1/cupshelper.cxx xpp-1.1-modified/cupshelper.cxx
---- xpp-1.1/cupshelper.cxx     2002-01-09 07:34:17.000000000 -0600
-+++ xpp-1.1-modified/cupshelper.cxx    2002-10-04 09:07:59.000000000 -0500
-@@ -67,14 +67,14 @@
-       return port_;
- }
- 
--void CupsHelper::setHostInfo(const char *host, int port = 631){
-+void CupsHelper::setHostInfo(const char *host, int port){
-       strcpy(host_,host);
-       cupsSetServer(host_);
-       port_ = port;
-       ippSetPort(port_);
- }
- 
--void CupsHelper::setLoginInfo(const char *usr = 0, const char *pwd = 0){
-+void CupsHelper::setLoginInfo(const char *usr, const char *pwd){
-       strcpy(login_,usr);
-       cupsSetUser(login_);
-       strcpy(password_,pwd);
-diff -urN xpp-1.1/cupshelper.h xpp-1.1-modified/cupshelper.h
---- xpp-1.1/cupshelper.h       2002-01-09 07:34:17.000000000 -0600
-+++ xpp-1.1-modified/cupshelper.h      2002-10-04 09:08:15.000000000 -0500
-@@ -51,8 +51,8 @@
- public: 
-       CupsHelper();
-       ~CupsHelper();
--  static void setLoginInfo(const char *usr = 0, const char *pwd = 0);
--  static void setHostInfo(const char *host, int port = 631);
-+  static void setLoginInfo(const char *usr, const char *pwd);
-+  static void setHostInfo(const char *host, int port);
-   static int port();
-   static const char* host();
-   static const char* password();

diff --git a/net-print/xpp/files/inputslider.h.patch b/net-print/xpp/files/inputslider.h.patch
deleted file mode 100644 (file)
index fa60690..0000000
--- a/net-print/xpp/files/inputslider.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- inputslider.h.1    2003-06-30 16:31:36.000000000 +0200
-+++ inputslider.h      2003-06-30 16:31:50.000000000 +0200
-@@ -85,14 +85,14 @@
-     void input_box(Fl_Boxtype s) {
-       inputfield_->box(Fl_Widget::box());
-     }
--    void color(Fl_Color s) {
-+    void color(int s) {
-       Fl_Widget::color(s);
-       slider_->color(Fl_Widget::color());
-     }
-     void input_color(Fl_Color s) {
-       inputfield_->color(Fl_Widget::color());
-     }
--    void selection_color(Fl_Color s) {
-+    void selection_color(int s) {
-       Fl_Widget::selection_color(s);
-       slider_->selection_color(Fl_Widget::selection_color());
-     }

diff --git a/net-print/xpp/xpp-1.5.ebuild b/net-print/xpp/xpp-1.5.ebuild
index e25ca22603b24bc7f5e1bd29df7f1c1ebc3906d4..df949ce2325f47446ab6caba0734463e12991aea 100644 (file)
--- a/net-print/xpp/xpp-1.5.ebuild
+++ b/net-print/xpp/xpp-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.12 2011/06/02 19:14:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.13 2011/12/10 14:12:17 ssuominen Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=net-print/cups-1.1.14
-       x11-libs/fltk:1
+       <x11-libs/fltk-1.3.0:1
        virtual/jpeg
        >=media-libs/libpng-1.4
        sys-libs/zlib