removing -r2 and added -r3

(Portage version: 2.0.51-r15)

6 files changed, 49 insertions, 22 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index 2aad37321392..7c4aeb19f1bd 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/xview
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.11 2005/02/17 11:22:16 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.12 2005/02/17 16:05:02 humpback Exp $
+
+  17 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/CAN-2005-0076.patch, -xview-3.2-r2.ebuild:
+  Removed -r2 that did not work with xorg. Added -r3 that does not use the
+  debian patches and has a new HOMEPAGE and seems to be supported there. This
+  version from the new home still needed the CAN-2005-0076 patch. This was
+  tested with xorg 6.8.0-r4 and 6.8.2 on x86.
 
 *xview-3.2-r2 (17 Feb 2005)
 
diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index 1c6c65f985c1..56c6ea356582 100644
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 26fd7eec926971993151e14fa5406f07 ChangeLog 1429
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 MD5 d87709e16fca935a377b34c6ff14e754 xview-3.2-r1.ebuild 2600
-MD5 0e99d750cbc4a74877a1c0762b147c94 xview-3.2-r2.ebuild 2608
+MD5 275e6b57bd731d264a31f69b84f3e474 xview-3.2-r3.ebuild 2672
 MD5 b1c37b2caa7f1d2968c3cbd84c77af2e xview-3.2.ebuild 2283
+MD5 ca8ca75012c0086e91666513ea0da88d files/CAN-2005-0076.patch 984
 MD5 6de3c812dee458777db24502d252984f files/digest-xview-3.2 138
 MD5 48636f5ace70cc3f5033a87188e4e7bf files/digest-xview-3.2-r1 138
-MD5 cd3869ae1beab1d2ac84fe48cc35d358 files/digest-xview-3.2-r2 144
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCFILr8zY1VwezZiERAtlbAJ9Gq0+fYU5nrsmUHHPXRtNq38E1ngCgnzrr
-TYUxO4rzEchVO+D14kNxa5M=
-=H+9L
------END PGP SIGNATURE-----
+MD5 d7d90bd733aab393a20a5919e05c0b49 files/digest-xview-3.2-r3 70
diff --git a/x11-libs/xview/files/CAN-2005-0076.patch b/x11-libs/xview/files/CAN-2005-0076.patch
new file mode 100644
index 000000000000..53952e100420
--- /dev/null
+++ b/x11-libs/xview/files/CAN-2005-0076.patch
@@ -0,0 +1,29 @@
+--- lib/libxview/base/xv_parse.c~	2005-01-15 17:11:54.000000000 +0100
++++ lib/libxview/base/xv_parse.c	2005-01-15 17:20:23.000000000 +0100
+@@ -312,7 +312,7 @@ xv_parse_one(app_name, argc, argv)
+     if (argc <= slot->num_args) {
+ 	char            dummy[128];
+ 
+-	(void) sprintf(dummy, 
++	(void) snprintf(dummy, sizeof(dummy),
+ 			XV_MSG("%s: missing argument after %s"), 
+ 			app_name,
+ 		       argv[0]);
+@@ -392,7 +392,7 @@ xv_parse_one(app_name, argc, argv)
+ 	if (defaults_lookup(argv[1], known_scales) == -1) {
+ 		char dummy[1024];
+ 		
+-		(void) sprintf(dummy, 
++		(void) snprintf(dummy, sizeof(dummy),
+ 			XV_MSG("%s: unknown scale \"%s\" used with %s option"),
+ 			       app_name, argv[1], argv[0]);
+ 		xv_error(XV_NULL,
+@@ -611,7 +611,7 @@ NegArg:
+     {
+ 	char            dummy[128];
+ 
+-	(void) sprintf(dummy, 
++	(void) snprintf(dummy, sizeof(dummy),
+ 		XV_MSG("%s: can't have negative argument %s after %s"),
+ 		       app_name, argv[bad_arg], argv[0]);
+ 	xv_error(XV_NULL,
diff --git a/x11-libs/xview/files/digest-xview-3.2-r2 b/x11-libs/xview/files/digest-xview-3.2-r2
deleted file mode 100644
index a3d92627b655..000000000000
--- a/x11-libs/xview/files/digest-xview-3.2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b9ff26d6ad378af320bac45154ceaeba xview-3.2p1.4.src.tar.gz 3227552
-MD5 526f16dcd2164713e792e19b9c9a42c2 xview_3.2p1.4-16woody2.diff.gz 65663
diff --git a/x11-libs/xview/files/digest-xview-3.2-r3 b/x11-libs/xview/files/digest-xview-3.2-r3
new file mode 100644
index 000000000000..d467cbbf21c7
--- /dev/null
+++ b/x11-libs/xview/files/digest-xview-3.2-r3
@@ -0,0 +1 @@
+MD5 a61e7ce82cac041a2c613041dc003de5 xview-3.2p1.4-18c.tar.gz 3377010
diff --git a/x11-libs/xview/xview-3.2-r2.ebuild b/x11-libs/xview/xview-3.2-r3.ebuild
index 460fa40dee27..1972afc246f6 100644
--- a/x11-libs/xview/xview-3.2-r2.ebuild
+++ b/x11-libs/xview/xview-3.2-r3.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r2.ebuild,v 1.1 2005/02/17 11:22:16 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r3.ebuild,v 1.1 2005/02/17 16:05:02 humpback Exp $
 
 inherit eutils
 
 DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/libs/X/xview/"
+HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
 
-MY_PN="${P}p1.4"
+MY_PN="${P}p1.4-18c"
 
 # This is our compound patch derived from debian. We use it because:
 #  * xview is a contribution made to Sun Microsystems (?) to the X community, but
 #    fixes for it don't appear to be around other than in the other free distributions.
 #  * It does little harm, only some defaults are changed which we can redefine anyway
-SRC_PATCH="${MY_PN/-/_}-16woody2.diff"
+#SRC_PATCH="${PN}_3.2p1.4-16woody2.diff"
 
 # We use the xview tarball available from the X organization, but xfree86 appears
 # to be up and available more often so we use that (it's their primary mirror).
-SRC_URI="http://www.ibiblio.org/pub/Linux/libs/X/xview/${MY_PN}.src.tar.gz
-		 mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz"
+SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/${MY_PN}.tar.gz"
+		 #mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz"
 S=${WORKDIR}/${MY_PN}
 LICENSE="sun-openlook"
 SLOT="0"
@@ -30,7 +30,8 @@ DEPEND="virtual/x11"
 src_unpack() {
 	unpack $A
 	cd $S
-	epatch ../${SRC_PATCH}
+	#epatch ../${SRC_PATCH}
+	epatch ${FILESDIR}/CAN-2005-0076.patch
 }
 
 src_compile() {