Deprecate xprint.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 16 insertions, 47 deletions

diff --git a/x11-apps/xmore/ChangeLog b/x11-apps/xmore/ChangeLog
index bcb934671562..be3625a8a779 100644
--- a/x11-apps/xmore/ChangeLog
+++ b/x11-apps/xmore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xmore
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.18 2008/10/11 22:28:08 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.19 2009/04/28 07:20:45 ssuominen Exp $
+
+  28 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> -xmore-1.0.1.ebuild,
+  xmore-1.0.1-r1.ebuild:
+  Deprecate xprint.
 
   11 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> xmore-1.0.1-r1.ebuild:
   Fix dependencies.
@@ -10,13 +14,10 @@
 
 *xmore-1.0.1-r1 (21 Jan 2008)
 
-  21 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  21 Jan 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/xmore-1.0.1-ifdef-xprint.patch, +xmore-1.0.1-r1.ebuild:
   Insert missing ifdef's for building without xprint, segmentation faults
-  without it. Debian bug report #365292.
-
-  21 Jan 2008; Samuli Suominen <drac@gentoo.org> xmore-1.0.1.ebuild:
-  Keyword ~amd64.
+  without it. Debian bug report #365292. Keyword ~amd64.
 
   19 Dec 2007; Dawid Węgliński <cla@gentoo.org> xmore-1.0.1.ebuild:
   Stable on x86 (bug #202087)
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index b4b273f555df..ff8c54ed0096 100644
--- a/x11-apps/xmore/Manifest
+++ b/x11-apps/xmore/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xmore-1.0.1-ifdef-xprint.patch 879 RMD160 df9c62aa6f42d131d4038b2615b431b074acb5d2 SHA1 de7cf22e6a529698f765f0f29551ad58835ebed8 SHA256 b1d9cd58ce7afdb4a266fb79e28c3ceec53fbb7ba8bbb62837e9afc14e8c19ef
 DIST xmore-1.0.1.tar.bz2 92060 RMD160 98c437125fb5c7cb384bb78b536ef69d4ca363f2 SHA1 abd0b926fc11c9d8c886f91b0b6a4834512cb0ba SHA256 653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527
-EBUILD xmore-1.0.1-r1.ebuild 665 RMD160 93f77ed2a2f6190b1b7762ab97e82caaa8d267af SHA1 ce4c85bc5c09b43f812921b561a1e99a0f68e6c0 SHA256 574969931a0a93aa8bf9a776031611223acab49f4485d6aa81cb32a9d8dbe0c4
-EBUILD xmore-1.0.1.ebuild 592 RMD160 370685eba819e93d96d09db749a823f207fbe974 SHA1 dbd24a8446531cda25583f11989bd500f3274b35 SHA256 6f65510ddcb8e509ff923892c796d8c9f8eba71ce72632ec3a5e8492b9d33854
-MISC ChangeLog 2334 RMD160 3f784ecbf3481637684d901afb4bfd05d8475cea SHA1 67a673ff19c29e94f4ebe91fc6c8ef894e00eed2 SHA256 4f0a4c26a87e6736d898af3773f72ddd41f5236a6ba438fe977aa1240275d97d
+EBUILD xmore-1.0.1-r1.ebuild 565 RMD160 673c5e6b55d78f61bf7f972a386d956b426db145 SHA1 49f2a749794274daeb60f0ad70f6c2043d8710c1 SHA256 5869e27f77a4b6a92839a3101e08ebf54320854396549d3c0fcdb8d4ff75fce1
+MISC ChangeLog 2388 RMD160 f08ea046557cc28c1fccca78ca04c4ed43950f43 SHA1 5f45e4f25c5eeb500fdd2dfddfcbddd5bfcb171a SHA256 5a722fea492d2ed0dc67e7a019f026d325fea03f2b797bb1e9fc82c4be728c86
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjxKH4ACgkQAiZjviIA2XhGGACgyvbrcP0ttZk3iB7ULLNhTAHb
-h38AoIVgQCVIeNAfVdm1JsGtm6q195/A
-=VIYu
------END PGP SIGNATURE-----
diff --git a/x11-apps/xmore/xmore-1.0.1-r1.ebuild b/x11-apps/xmore/xmore-1.0.1-r1.ebuild
index 905571eb9f25..cbe5ff873ea0 100644
--- a/x11-apps/xmore/xmore-1.0.1-r1.ebuild
+++ b/x11-apps/xmore/xmore-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/xmore-1.0.1-r1.ebuild,v 1.2 2008/10/11 22:28:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/xmore-1.0.1-r1.ebuild,v 1.3 2009/04/28 07:20:45 ssuominen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,12 +8,9 @@
 inherit x-modular
 
 DESCRIPTION="plain text display program for the X Window System"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-# Broken without xprint
-IUSE="xprint"
-RDEPEND="xprint? ( x11-libs/libXprintUtil )
-	x11-libs/libXaw"
-#x11-libs/libXprintUtil"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
 PATCHES="${FILESDIR}/${P}-ifdef-xprint.patch"
-CONFIGURE_OPTIONS="$(use_enable xprint)"
+CONFIGURE_OPTIONS="--disable-xprint"
diff --git a/x11-apps/xmore/xmore-1.0.1.ebuild b/x11-apps/xmore/xmore-1.0.1.ebuild
deleted file mode 100644
index 71ed46fe3f58..000000000000
--- a/x11-apps/xmore/xmore-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/xmore-1.0.1.ebuild,v 1.8 2008/03/24 14:15:36 maekke Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="plain text display program for the X Window System"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 s390 sh ~sparc x86"
-# Broken without xprint
-IUSE="xprint"
-RDEPEND="xprint? ( x11-libs/libXprintUtil )"
-#x11-libs/libXprintUtil"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="$(use_enable xprint)"