commit: d91b9b1d32f9e6a59891a4c476efa201d7d29439 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Tue Nov 11 10:31:39 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Tue Nov 11 15:48:11 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d91b9b1d
x11-libs/xview: Drop old; correct man path Package-Manager: portage-2.2.14 --- x11-libs/xview/ChangeLog | 7 +- x11-libs/xview/files/CAN-2005-0076.patch | 29 --------- x11-libs/xview/files/lseek.diff | 26 -------- x11-libs/xview/files/lseek2.diff | 22 ------- x11-libs/xview/xview-3.2-r6.ebuild | 105 ------------------------------ x11-libs/xview/xview-3.2-r7.ebuild | 108 ------------------------------- x11-libs/xview/xview-3.2-r8.ebuild | 4 +- 7 files changed, 9 insertions(+), 292 deletions(-) diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog index b15eb5c..4210a0e 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 <[email protected]> -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 <[email protected]> xview-3.2-r6.ebuild, xview-3.2-r7.ebuild, xview-3.2-r8.ebuild: Fix header 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 53952e1..0000000 --- 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 6a9ea51..0000000 --- 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 7f8715f..0000000 --- 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 067f729..0000000 --- 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 a3bdea5..0000000 --- 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 7c53075..2ca8712 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 }
