x11-libs/xview: Drop old; correct man path

Package-Manager: portage-2.2.14

8 files changed, 9 insertions, 295 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index b15eb5c50..4210a0e07 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for x11-libs/xview
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Nov 2014; Justin Lecher <jlec@gentoo.org> -xview-3.2-r6.ebuild,
+  -xview-3.2-r7.ebuild, xview-3.2-r8.ebuild, -files/CAN-2005-0076.patch,
+  -files/lseek.diff, -files/lseek2.diff:
+  Drop old; correct man path
+
   03 Mar 2013; Justin Lecher <jlec@gentoo.org> xview-3.2-r6.ebuild,
   xview-3.2-r7.ebuild, xview-3.2-r8.ebuild:
   Fix header
diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index f5d25796f..979d0309d 100644
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,5 +1,2 @@
-DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba SHA512 d4c80bccc2b8d57ff6906002b1b3e12f0cb480c7873ef118423d7bd566a6b655f422c61782893f796889052b1ab19f1328fcf670a1e0ef93e6b2e28aec2eb80b WHIRLPOOL f42e871a21c06bb213e9726edd88e58b9024320e95798b4acf32222dd3b0efd6b5183dcdfe64c3b257429fee1524d010e3f8e75f5428642d87fd81ef99244deb
-DIST xview-3.2p1.4-19c.tar.gz 3350088 SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83 SHA512 d0e29de2d540d0cc8ec2739e61e0ccdf36cf97f4e87fcffe469733e1649ee837d3ed115b944f92843612752fdb823227df7ffd55ec62c093aea1b04d9f2f3af9 WHIRLPOOL 78b87f49c2605b418e4c6294a7323ed4a85f4fa741ab80f3013b934877bae07c969c1a7fde5b422f6a7eb88217bf7c48d43c01f2633e5886aa21925dd669ab3a
 DIST xview_3.2p1.4-28.1.debian.tar.gz 95914 SHA256 b0dcf9904f50b580ee408e93107674d77799b2126374b3d4a1db73d0e7e24cbe SHA512 8c3a2474b7d267348040179c66ddd492e3101a5ff3301f9954ae6b1b0affa398381deb95ec7a51693053caf4e666327fe6033a1d3b5acfe4aa690f20b138dd06 WHIRLPOOL e6d84b1cfa6e2089b27f7f9201a73e0f6c31b714205854b8d17833244ee99cd5917c943c010df5908f5cb7b09540686e29b14651008993dce8de0adeae969118
-DIST xview_3.2p1.4-28.debian.tar.gz 95902 SHA256 38458016e3cabb2264a0aa0f8fd0e8ddb00dda5659755eb6dc35d2af58243ec0 SHA512 80beaf7a3fad6aa8d410913ab218426b3bd2dda0b9ad3242989973cf3f2cdd9a43238f939f9a6d72ca8859dfa867365513b5ab5f226ba4c4a75a8a3579d90f28 WHIRLPOOL 31b065a9b22d116a5b3e648583d4b6237781ecace7d31d5d701fefe5f180f90f7e549fed3cbe7d72e8794ab5a3278eb5e15cdc01d1e0c9c0374f3eed0e52eae6
 DIST xview_3.2p1.4.orig.tar.gz 3227552 SHA256 fcc88f884a6cb05789ed800edea24d9c4cf1f60cb7d61f3ce7f10de677ef9e8d SHA512 5dd55529aee68d5ca7f2ff4e899b790b59cefb1bcd95706eef9b9e2c5545dc4ca6c866a55ed06ca91914ebde5d6ca4dcd038ce9e2ae97bfe240595b045a69315 WHIRLPOOL 4c1ef22107350659ec4b91beb48c52060f94a82e6ab30641b47afbd42d99d1f46e806b007b90c36fb3079869ba57ef9d41c59ffce0d648cb8ef2088608474a59
diff --git a/x11-libs/xview/files/CAN-2005-0076.patch b/x11-libs/xview/files/CAN-2005-0076.patch
deleted file mode 100644
index 53952e100..000000000
--- a/x11-libs/xview/files/CAN-2005-0076.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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/lseek.diff b/x11-libs/xview/files/lseek.diff
deleted file mode 100644
index 6a9ea51e6..000000000
--- a/x11-libs/xview/files/lseek.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib/libxview/textsw/es_file.c.old	2006-02-18 23:26:14.000000000 -0500
-+++ lib/libxview/textsw/es_file.c	2006-02-18 23:26:37.000000000 -0500
-@@ -119,9 +119,7 @@
- extern int      errno, sys_nerr;
- extern char    *sys_errlist[];
- #endif
--#ifndef __CYGWIN__
--extern long     lseek();
--#endif
-+extern off_t     lseek();
- 
- static void update_read_buf();  /* update the read buf if overlaps write buf */
- static Es_status es_file_commit();
---- lib/libxview/sel/sel_agent.c.old	2006-02-18 23:17:33.000000000 -0500
-+++ lib/libxview/sel/sel_agent.c	2006-02-18 23:18:23.000000000 -0500
-@@ -314,9 +314,7 @@
-     struct stat     stat_buf;
-     int             count, size;
-     char           *destp;
--#ifndef __CYGWIN__
--    extern long     lseek();
--#endif
-+    extern off_t     lseek();
-     if (fstat(fd, &stat_buf) != 0) {
- 	perror(XV_MSG("Agent couldn't reply about a file"));
- 	return SELN_FAILED;
diff --git a/x11-libs/xview/files/lseek2.diff b/x11-libs/xview/files/lseek2.diff
deleted file mode 100644
index 7f8715f78..000000000
--- a/x11-libs/xview/files/lseek2.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/libxview/textsw/es_file.c	1997-04-28 14:45:37.000000000 +0200
-+++ lib/libxview/textsw/es_file.c.new	2009-02-03 09:51:34.000000000 +0100
-@@ -114,7 +114,7 @@
- 
- extern int      errno, sys_nerr;
- extern char    *sys_errlist[];
--extern long     lseek();
-+extern off_t     lseek();
- 
- static void update_read_buf();  /* update the read buf if overlaps write buf */
- static Es_status es_file_commit();
---- lib/libxview/sel/sel_agent.c	1997-06-19 22:45:57.000000000 +0200
-+++ lib/libxview/sel/sel_agent.c.new	2009-02-03 09:53:34.000000000 +0100
-@@ -309,7 +309,7 @@
-     struct stat     stat_buf;
-     int             count, size;
-     char           *destp;
--    extern long     lseek();
-+    extern off_t     lseek();
- 
-     if (fstat(fd, &stat_buf) != 0) {
- 	perror(XV_MSG("Agent couldn't reply about a file"));
diff --git a/x11-libs/xview/xview-3.2-r6.ebuild b/x11-libs/xview/xview-3.2-r6.ebuild
deleted file mode 100644
index 067f729d2..000000000
--- a/x11-libs/xview/xview-3.2-r6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils toolchain-funcs multilib
-
-MY_PN="${P}p1.4-19c"
-GCC_PATCHVER="0.1"
-
-DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
-HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
-LICENSE="XVIEW"
-# 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://physionet.caregroup.harvard.edu/physiotools/xview/src/${MY_PN}.tar.gz
-		mirror://gentoo/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2"
-		# mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz
-
-SLOT="0"
-IUSE=""
-KEYWORDS="-alpha -amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="x11-libs/libXpm
-	x11-proto/xextproto
-	media-fonts/font-bh-75dpi
-	media-fonts/font-sun-misc
-	x11-misc/xbitmaps"
-
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-S=${WORKDIR}/${MY_PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# This is our compound patch derived from debian. We use it because:
-	#  * xview is a contribution made by 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="${PN}_3.2p1.4-16woody2.diff"
-	epatch "${FILESDIR}"/lseek.diff
-	epatch "${DISTDIR}"/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2
-
-	# Do not build xgettext and msgfmt since they are provided by the gettext
-	# package. Using the programs provided by xview breaks many packages
-	# including vim, grep and binutils.
-	sed -e 's/MSG_UTIL = xgettext msgfmt/#MSG_UTIL = xgettext msgfmt/' \
-		-i util/Imakefile || die "gettext sed failed"
-
-	# (#120910) Look for imake in the right place
-	sed -i -e 's:\/X11::' imake || die "imake sed failed"
-
-	sed -i -e 's:/usr/X11R6:/usr:' "${S}/config/XView.cf" "${S}/Build-XView.bash"
-
-	# Nasty hacks to force CC and CFLAGS
-	sed -e "s:^\(IMAKEINCLUDE=.*\)\"$:\1 -DCcCmd=$(tc-getCC)\":" \
-		-e "s:usr/lib/X11/config:usr/$(get_libdir)/X11/config:" -i Build-XView.bash
-	sed -e "s:\(.*STD_DEFINES =.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.obj
-	sed -e "s:\(.*define LibXViewDefines .*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.cf
-	sed -e "s:^\(MORECCFLAGS.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i clients/olvwm-4.1/Imakefile
-}
-
-src_compile() {
-	export OPENWINHOME="/usr"
-	export X11DIR="/usr"
-
-	# This is crazy and I know it, but wait till you read the code in
-	# Build-XView.bash.
-	bash Build-XView.bash libs \
-		|| die "building libs failed"
-	bash Build-XView.bash clients \
-		|| die "building clients failed"
-	bash Build-XView.bash contrib \
-		|| die "building contrib failed"
-	bash Build-XView.bash olvwm \
-		|| die "building olvwm failed"
-}
-
-src_install() {
-	export OPENWINHOME="/usr"
-	export X11DIR="/usr"
-	export DESTDIR="${D}"
-
-	bash Build-XView.bash instlibs \
-		|| die "installing libs failed"
-	bash Build-XView.bash instclients \
-		|| die "installing clients failed"
-	bash Build-XView.bash instcontrib \
-		|| die "installing contrib failed"
-	bash Build-XView.bash instolvwm \
-		|| die "installing olvwm failed"
-	cd "${D}"/usr
-
-	# The rest of the docs is already installed
-	cd "${S}"/doc
-	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt \
-		dnd_api.txt whats_new.ps
-	rm -rf "${D}"/usr/X11R6/share/doc/xview && rm -rf "${D}"/usr/X11R6/share/doc
-}
diff --git a/x11-libs/xview/xview-3.2-r7.ebuild b/x11-libs/xview/xview-3.2-r7.ebuild
deleted file mode 100644
index a3bdea567..000000000
--- a/x11-libs/xview/xview-3.2-r7.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-MY_PN="${P}p1.4"
-
-DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
-HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
-# We usr the debian tarball so that the debian patches apply
-SRC_URI="
-	mirror://debian/pool/main/x/xview/xview_3.2p1.4.orig.tar.gz
-	mirror://debian/pool/main/x/xview/xview_3.2p1.4-28.debian.tar.gz"
-
-LICENSE="XVIEW"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux -*"
-IUSE="static-libs"
-
-RDEPEND="
-	media-fonts/font-bh-75dpi
-	media-fonts/font-sun-misc
-	x11-libs/libXpm
-	x11-misc/xbitmaps
-	x11-proto/xextproto"
-
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	append-flags -m32
-	append-ldflags -m32
-
-	EPATCH_OPTS="-p1"
-
-	epatch \
-		"${FILESDIR}"/${P}-impl-dec.patch \
-		"${WORKDIR}"/debian/patches/{debian-changes-3.2p1.4-26,display_setting}
-
-	# Do not build xgettext and msgfmt since they are provided by the gettext
-	# package. Using the programs provided by xview breaks many packages
-	# including vim, grep and binutils.
-	sed \
-		-e 's/MSG_UTIL = xgettext msgfmt/#MSG_UTIL = xgettext msgfmt/' \
-		-i util/Imakefile || die "gettext sed failed"
-
-	# (#120910) Look for imake in the right place
-	sed -i -e 's:\/X11::' imake || die "imake sed failed"
-
-	sed -i -e 's:/usr/X11R6:/usr:' config/XView.cf Build-LinuxXView.bash || die
-
-	# Nasty hacks to force CC and CFLAGS
-	sed \
-		-e "s:^\(IMAKEINCLUDE=.*\)\"$:\1 -DCcCmd=$(tc-getCC)\":" \
-		-e "s:usr/lib/X11/config:usr/$(get_libdir)/X11/config:" -i Build-LinuxXView.bash || die
-	sed -e "s:\(.*STD_DEFINES =.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.obj || die
-	sed -e "s:\(.*define LibXViewDefines .*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.cf || die
-	sed -e "s:^\(MORECCFLAGS.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i clients/olvwm-4.1/Imakefile
-	sed -e "s:\(-Wl,-soname\):${LDFLAGS} \1:g" -i config/XView.rules || die
-}
-
-src_compile() {
-	export OPENWINHOME="/usr"
-	export X11DIR="/usr"
-	export MANDIR="/usr/share/man"
-
-	# This is crazy and I know it, but wait till you read the code in
-	# Build-LinuxXView.bash.
-	bash Build-LinuxXView.bash libs \
-		|| die "building libs failed"
-#	bash Build-LinuxXView.bash clients \
-#		|| die "building clients failed"
-#	bash Build-LinuxXView.bash contrib \
-#		|| die "building contrib failed"
-#	bash Build-LinuxXView.bash olvwm \
-#		|| die "building olvwm failed"
-}
-
-src_install() {
-	export OPENWINHOME="/usr"
-	export X11DIR="/usr"
-	export MANDIR="/usr/share/man"
-	export DESTDIR="${ED}"
-
-	bash Build-LinuxXView.bash instlibs \
-		|| die "installing libs failed"
-#	bash Build-LinuxXView.bash instclients \
-#		|| die "installing clients failed"
-#	bash Build-LinuxXView.bash instcontrib \
-#		|| die "installing contrib failed"
-#	bash Build-LinuxXView.bash instolvwm \
-#		|| die "installing olvwm failed"
-#	cd "${ED}"/usr
-
-	use static-libs || \
-		find "${ED}" -type f -name "*.a" -delete
-
-	cd "${S}"/doc
-	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt dnd_api.txt whats_new.ps
-	rm -rf "${ED}"/usr/X11R6/share/doc/xview "${ED}"/usr/X11R6/share/doc "${ED}"/usr/bin || die
-}
diff --git a/x11-libs/xview/xview-3.2-r8.ebuild b/x11-libs/xview/xview-3.2-r8.ebuild
index 7c53075f8..2ca8712bc 100644
--- a/x11-libs/xview/xview-3.2-r8.ebuild
+++ b/x11-libs/xview/xview-3.2-r8.ebuild
@@ -102,7 +102,9 @@ src_install() {
 	use static-libs || \
 		find "${ED}" -type f -name "*.a" -delete
 
-	cd "${S}"/doc
+	mv "${ED}"/usr/man "${ED}"/usr/share/ || die
+
+	cd "${S}"/doc || die
 	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt dnd_api.txt whats_new.ps
 	rm -rf "${ED}"/usr/X11R6/share/doc/xview "${ED}"/usr/X11R6/share/doc "${ED}"/usr/bin || die
 }