old

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 7 insertions, 56 deletions

diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog
index df10baa062f2..6a02958abce8 100644
--- 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/files/cups.diff b/net-print/xpp/files/cups.diff
deleted file mode 100644
index dae39512cb71..000000000000
--- 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
index fa606900de2d..000000000000
--- 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 e25ca22603b2..df949ce2325f 100644
--- 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