* [gentoo-commits] proj/sci:master commit in: x11-libs/xview/
@ 2016-02-22 13:25 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2016-02-22 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 3e0a8c14f67d70ca851753dee63bbae19621ab7b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 11:19:27 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 11:19:27 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3e0a8c14
x11-libs/xview: Bump to EAPI=6
* Break lines at < 80 chars
* Add missing die
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
x11-libs/xview/metadata.xml | 2 +-
x11-libs/xview/xview-3.2-r8.ebuild | 49 ++++++++++++++++++++++----------------
2 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml
index fc33570..1d8b530 100644
--- a/x11-libs/xview/metadata.xml
+++ b/x11-libs/xview/metadata.xml
@@ -5,7 +5,7 @@
<email>jlec@gentoo.org</email>
<name>Justin Lecher</name>
</maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</maintainer>
diff --git a/x11-libs/xview/xview-3.2-r8.ebuild b/x11-libs/xview/xview-3.2-r8.ebuild
index 28b02c9..7aa0d76 100644
--- a/x11-libs/xview/xview-3.2-r8.ebuild
+++ b/x11-libs/xview/xview-3.2-r8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils toolchain-funcs flag-o-matic multilib
@@ -34,21 +34,21 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_PN}
+PATCHES=(
+ "${FILESDIR}"/${P}-impl-dec.patch
+ "${WORKDIR}"/debian/patches/{debian-changes-3.2p1.4-26,display_setting}
+)
+
src_prepare() {
+ default
+
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/' \
+ 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
@@ -57,12 +57,15 @@ src_prepare() {
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:^\(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 || die
sed -e "s:\(-Wl,-soname\):${LDFLAGS} \1:g" -i config/XView.rules || die
}
@@ -99,12 +102,18 @@ src_install() {
# || die "installing olvwm failed"
# cd "${ED}"/usr
- use static-libs || \
- find "${ED}" -type f -name "*.a" -delete
+ if ! use static-libs; then
+ find "${ED}" -type f -name "*.a" -delete || die
+ fi
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
+ 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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/sci:master commit in: x11-libs/xview/
@ 2013-02-27 17:23 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2013-02-27 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 99205403817547cd99135ab859d312d8ed631391
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 25 16:16:49 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 16:16:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=99205403
x11-libs/xview: Version Bump
Package-Manager: portage-2.2.0_alpha163
---
x11-libs/xview/ChangeLog | 8 ++-
x11-libs/xview/metadata.xml | 10 ++--
x11-libs/xview/xview-3.2-r8.ebuild | 108 ++++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+), 6 deletions(-)
diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index 5716bc1..9d09fbe 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for x11-libs/xview
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*xview-3.2-r8 (25 Feb 2013)
+
+ 25 Feb 2013; Justin Lecher <jlec@gentoo.org> +xview-3.2-r8.ebuild,
+ metadata.xml:
+ Version Bump
+
31 Jul 2012; Justin Lecher <jlec@gentoo.org> xview-3.2-r6.ebuild,
xview-3.2-r7.ebuild:
Add missing inherit of multilib
diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml
index 04b998a..59d99c3 100644
--- a/x11-libs/xview/metadata.xml
+++ b/x11-libs/xview/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <maintainer>
- <email>jlec@gentoo.org</email>
- <name>Justin Lecher</name>
- </maintainer>
+ <herd>sci</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/xview/xview-3.2-r8.ebuild b/x11-libs/xview/xview-3.2-r8.ebuild
new file mode 100644
index 0000000..5f86dec
--- /dev/null
+++ b/x11-libs/xview/xview-3.2-r8.ebuild
@@ -0,0 +1,108 @@
+## Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $
+
+EAPI=5
+
+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.1.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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/sci:master commit in: x11-libs/xview/
@ 2012-07-31 10:11 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2012-07-31 10:11 UTC (permalink / raw
To: gentoo-commits
commit: ffe59cae3e15c9c317768007f2010dad17de348d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 31 10:11:38 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 10:11:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ffe59cae
x11-libs/xview: Add missing inherit of multilib
(Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit)
---
x11-libs/xview/ChangeLog | 4 ++++
x11-libs/xview/xview-3.2-r6.ebuild | 4 ++--
x11-libs/xview/xview-3.2-r7.ebuild | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index 59416a1..5716bc1 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 Jul 2012; Justin Lecher <jlec@gentoo.org> xview-3.2-r6.ebuild,
+ xview-3.2-r7.ebuild:
+ Add missing inherit of multilib
+
*xview-3.2-r7 (31 Jul 2012)
31 Jul 2012; Justin Lecher <jlec@gentoo.org> +xview-3.2-r7.ebuild,
diff --git a/x11-libs/xview/xview-3.2-r6.ebuild b/x11-libs/xview/xview-3.2-r6.ebuild
index 0d38495..5da5aad 100644
--- a/x11-libs/xview/xview-3.2-r6.ebuild
+++ b/x11-libs/xview/xview-3.2-r6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs multilib
MY_PN="${P}p1.4-19c"
GCC_PATCHVER="0.1"
diff --git a/x11-libs/xview/xview-3.2-r7.ebuild b/x11-libs/xview/xview-3.2-r7.ebuild
index 6ca59a3..a69274f 100644
--- a/x11-libs/xview/xview-3.2-r7.ebuild
+++ b/x11-libs/xview/xview-3.2-r7.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic multilib
MY_PN="${P}p1.4"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/sci:master commit in: x11-libs/xview/
@ 2011-06-25 17:21 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2011-06-25 17:21 UTC (permalink / raw
To: gentoo-commits
commit: d7ef664fec638358e6ddbe7238565cd85580b276
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 07:48:08 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 07:48:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d7ef664f
Fixed herd entry in metadata.xml
(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
x11-libs/xview/ChangeLog | 5 ++++-
x11-libs/xview/metadata.xml | 11 +++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index 84009e2..c281a43 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for x11-libs/xview
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Fixed herd entry in metadata.xml
+
03 Feb 2009; justin Lecher (jlec) <jlec@j-schmitz.net>
xview-3.2-r6.ebuild, -xview-3.2-r7.ebuild, xview-3.2-r8.ebuild:
included fix from bug 245409 Thanks to pva
diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml
index 27e626a..59d99c3 100644
--- a/x11-libs/xview/metadata.xml
+++ b/x11-libs/xview/metadata.xml
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>maintainer-wanted</herd>
- <maintainer>
- <email>jlec@gentoo.org</email>
- <name>Justin Lecher</name>
- </maintainer>
+ <herd>sci</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
</pkgmetadata>
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-02-22 13:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-22 13:25 [gentoo-commits] proj/sci:master commit in: x11-libs/xview/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-02-27 17:23 Justin Lecher
2012-07-31 10:11 Justin Lecher
2011-06-25 17:21 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox