summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2018-02-09 13:06:48 +0100
committerMartin Väth <martin@mvath.de>2018-02-09 20:41:29 +0100
commit3f50137296bf6ca4d385f2cd144cb37d6ddcdeda (patch)
tree9b99045c6eaa1de1cf6b9597ea4bbc9fdde37edc
parentwww-plugins/noscript: Version bump. Fix date (diff)
downloadmv-3f50137296bf6ca4d385f2cd144cb37d6ddcdeda.tar.gz
mv-3f50137296bf6ca4d385f2cd144cb37d6ddcdeda.tar.bz2
mv-3f50137296bf6ca4d385f2cd144cb37d6ddcdeda.zip
Align with upstream: Bump alpine. Drop motif, wvdial, wvstreams, recode
-rw-r--r--app-text/recode/Manifest2
-rw-r--r--app-text/recode/files/recode-3.6-as-if.patch19
-rw-r--r--app-text/recode/files/recode-3.6-gettextfix.diff23
-rw-r--r--app-text/recode/metadata.xml8
-rw-r--r--app-text/recode/recode-3.6_p20-r1.ebuild71
-rw-r--r--mail-client/alpine/Manifest2
-rw-r--r--mail-client/alpine/alpine-2.21.1.ebuild (renamed from mail-client/alpine/alpine-2.21.ebuild)13
-rw-r--r--metadata/pkg_desc_index7
-rw-r--r--net-dialup/wvdial/Manifest1
-rw-r--r--net-dialup/wvdial/files/wvdial-1.61-as-needed.patch15
-rw-r--r--net-dialup/wvdial/files/wvdial-1.61-destdir.patch35
-rw-r--r--net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch20
-rw-r--r--net-dialup/wvdial/metadata.xml8
-rw-r--r--net-dialup/wvdial/wvdial-1.61.ebuild50
-rw-r--r--net-libs/wvstreams/Manifest1
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch36
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch50
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch23
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch16
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.1.0.patch25
-rw-r--r--net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch56
-rw-r--r--net-libs/wvstreams/metadata.xml16
-rw-r--r--net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild105
-rw-r--r--profiles/use.local.desc1
-rw-r--r--x11-libs/motif/Manifest1
-rw-r--r--x11-libs/motif/motif-2.3.8.ebuild114
26 files changed, 125 insertions, 593 deletions
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
deleted file mode 100644
index d2eb9360..00000000
--- a/app-text/recode/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST recode-3.6.tar.gz 1751886 SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
-DIST recode_3.6-20.debian.tar.gz 341117 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch
deleted file mode 100644
index c7bcc27c..00000000
--- a/app-text/recode/files/recode-3.6-as-if.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/283029
-
---- a/m4/flex.m4
-+++ b/m4/flex.m4
-@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
- dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
- AC_DEFUN(ad_AC_PROG_FLEX,
- [AC_CHECK_PROGS(LEX, flex, missing)
--if test "$LEX" = missing; then
-+AS_IF([test "$LEX" = missing], [dnl
- LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
- LEX_OUTPUT_ROOT=lex.yy
- AC_SUBST(LEX_OUTPUT_ROOT)dnl
--else
-+], [:
- AC_PROG_LEX
- AC_DECL_YYTEXT
--fi])
-+])])
diff --git a/app-text/recode/files/recode-3.6-gettextfix.diff b/app-text/recode/files/recode-3.6-gettextfix.diff
deleted file mode 100644
index 3b7eb8ba..00000000
--- a/app-text/recode/files/recode-3.6-gettextfix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/239372
-
-patch by Dmitry Karasik
-
---- recode-3.6/m4/gettext.m4
-+++ recode-3.6/m4/gettext.m4
-@@ -109,12 +109,12 @@
- else
- ac_items="$LINGUAS"
- for ac_item in $ac_items; do
-- case "$ALL_LINGUAS" in
-- *$ac_item*)
-+ for supported_item in $ALL_LINGUAS; do
-+ if test "$ac_item" = "$supported_item"; then
- ac_print="$ac_print $ac_item"
- MOFILES="$MOFILES $ac_item.mo"
-- ;;
-- esac
-+ fi
-+ done
- done
- fi
- AC_SUBST(MOFILES)
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
deleted file mode 100644
index 3e927f8d..00000000
--- a/app-text/recode/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>shell-tools@gentoo.org</email>
- <name>Gentoo Shell Tools Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
deleted file mode 100644
index 879a798a..00000000
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# WANT_AUTOMAKE="1.11" # bug 419455
-
-inherit autotools flag-o-matic libtool toolchain-funcs multilib-minimal
-
-MY_P=${P%_*}
-MY_PV=${PV%_*}
-DEB_PATCH=${PV#*p}
-
-DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="http://recode.progiciels-bpi.ca/"
-SRC_URI="
- mirror://gnu/${PN}/${MY_P}.tar.gz
- mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls static-libs"
-
-DEPEND="
- sys-devel/flex
- nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # fix #571106 by restoring pre-GCC5 inline semantics
- append-cflags -std=gnu89
-
- rm "${WORKDIR}"/debian/patches/series || die
- eapply "${FILESDIR}/${MY_P}-gettextfix.diff"
- eapply "${FILESDIR}"/${MY_P}-as-if.patch
- eapply "${WORKDIR}"/debian/patches/*
- sed -i '1i#include <stdlib.h>' src/argmatch.c || die
-
- # Avoid WANT_AUTOMAKE="1.11" (bug 419455):
- sed -i -e '/^AM_C_PROTOTYPES/d' configure.in || die
- sed -i -e 's/ansi2knr//' src/Makefile.am || die
-
- # Remove old libtool macros
- rm "${S}"/acinclude.m4 || die
-
- mv configure.in configure.ac || die
-
- eapply_user
- eautoreconf
- elibtoolize
-}
-
-multilib_src_configure() {
- # on solaris -lintl is needed to compile
- [[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
- # --without-included-gettext means we always use system headers
- # and library
- ECONF_SOURCE="${S}" econf \
- --without-included-gettext \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -exec rm -f {} + || die
- rm -f "${ED}"/usr/lib/charset.alias || die
-}
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index ee8eb046..bc950f50 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,3 +1,3 @@
DIST alpine-2.00-chappa-115-all.patch.gz 212705 SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7
DIST alpine-2.00.tar.bz2 5222673 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2
-DIST alpine-2.21.tar.xz 4720856 SHA512 a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264
+DIST alpine-2.21.1.tar.gz 7490699 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7
diff --git a/mail-client/alpine/alpine-2.21.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
index d73824b0..79cc65bf 100644
--- a/mail-client/alpine/alpine-2.21.ebuild
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 2017 Gentoo Foundation
+# Copyright 2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs vcs-snapshot
DESCRIPTION="alpine is an easy to use text-based based mail and news client"
-HOMEPAGE="http://www.washington.edu/alpine/ http://alpine.freeiz.com/alpine/ http://repo.or.cz/alpine.git/"
-SRC_URI="http://alpine.freeiz.com/alpine/release/src/${P}.tar.xz https://sources.voidlinux.eu/${P}/${P}.tar.xz"
+HOMEPAGE="http://www.washington.edu/alpine/ http://repo.or.cz/alpine.git/"
+GIT_COMMIT="672d6838a9babf2faeb9f79267525a4ab9d20b14"
+SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -64,13 +65,13 @@ src_configure() {
}
src_compile() {
- emake -j1 AR=$(tc-getAR)
+ emake AR=$(tc-getAR)
}
src_install() {
if use onlyalpine ; then
dobin alpine/alpine
- doman doc/alpine.1
+ doman doc/man1/alpine.1
else
emake DESTDIR="${D}" install
doman doc/man1/*.1
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 55db9711..ac2e307d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -47,7 +47,6 @@ app-text/ispell 3.3.02-r1 3.4.00: fast screen-oriented spelling checker
app-text/lesspipe 1.83 1.84_alpha20170925 99999999: Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon
app-text/mbtpdfasm 1.0.28-r1: Tool to assemble/merge, extract information from, and update the metadata in PDF
app-text/psjoin 0.3: concatenate postscript files. From new PostScript Utilities
-app-text/recode 3.6_p20-r1: Convert files between various character sets
app-text/stardict 3.0.6-r4 4.0.0_pre20160518-r2: A international dictionary supporting fuzzy and glob style matching
dev-cpp/cpplint 99999999: The google styleguide together with cpplint and an emacs file
dev-libs/osformat 1.0.5 999999999: C++ library for a typesafe printf/sprintf based on << conversion
@@ -68,7 +67,7 @@ games-rpg/aklabeth 1.0-r1: A remake of Richard C. Garriott's Ultima prequel
games-rpg/dsa-stats 1.0: calculate stat probabalities for the role playing game DSA - Das schwarze Auge
games-rpg/m5figur-mv 2.8.2: LaTeX2e character sheet layout for the Midgard Role Playing Game (Edition M5)
games-rpg/magus 1.3.1 1.3.3 99999999: A character generator for the popular German role playing game Midgard
-mail-client/alpine 2.00-r7 2.21: alpine is an easy to use text-based based mail and news client
+mail-client/alpine 2.00-r7 2.21.1: alpine is an easy to use text-based based mail and news client
media-gfx/pqiv 2.10.2: powerful GTK based command-line image viewer with a minimal UI
media-tv/nvtv 0.4.7-r3: TV-Out for NVidia cards
media-tv/sundtek-tv 180205.112233: Sundtek MediaTV Pro III Drivers
@@ -77,11 +76,9 @@ media-video/avinfo 1.0_alpha15_p1: Utility for displaying AVI information
media-video/video-mv 12.1: Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder
net-dialup/accounting 1.60.45.3.1: Give statistics about dialup connections. Originally part of SuSE's smpppd
net-dialup/martian-modem 20100123-r2: ltmodem alternative driver providing support for Agere Systems winmodems
-net-dialup/wvdial 1.61: Excellent program to automatically configure PPP sessions
net-dns/host 20070128-r1: A powerful command-line DNS query and test tool
net-dns/noip-updater 2.1.9-r4: no-ip.com dynamic DNS updater
net-firewall/firewall-mv 13.0: Initialize iptables and net-related sysctl variables
-net-libs/wvstreams 4.6.1-r3: A network programming library in C++
net-misc/openrdate 1.2: use TCP or UDP to retrieve the current time of another machine
net-misc/sshstart 3.00: Start ssh-agent/ssh-add only if you really use ssh or friends
net-print/foo2zjs 20160722: Support for printing to ZjStream-based printers
@@ -134,6 +131,6 @@ www-plugins/ublock-origin 1.15.4: Firefox webextension: An efficient list-based
www-plugins/xclear 1.8.2-r1: Firefox legacy add-on: button to clear URL
x11-drivers/nvidia-drivers 173.14.39-r2: NVIDIA Accelerated Graphics Driver
x11-libs/gtk+ 2.24.31-r1 3.22.19 3.22.26: Gimp ToolKit +
-x11-libs/motif 2.3.7: The Motif user interface component toolkit
+x11-libs/motif 2.3.7 2.3.8: The Motif user interface component toolkit
x11-misc/redshift 1.8: A screen color temperature adjusting software
x11-wm/fvwm 2.6.7-r1: An extremely powerful ICCCM-compliant multiple virtual desktop window manager
diff --git a/net-dialup/wvdial/Manifest b/net-dialup/wvdial/Manifest
deleted file mode 100644
index aaeb2e52..00000000
--- a/net-dialup/wvdial/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wvdial-1.61.tar.gz 94854 SHA512 e949632583d889ad040c284f42c46790d247fffbc2d5e926c4b5836c970002f07741d26d052489bdc9c8144dcbb62a12851a3c275a5cecd5393d2722f43bb49a
diff --git a/net-dialup/wvdial/files/wvdial-1.61-as-needed.patch b/net-dialup/wvdial/files/wvdial-1.61-as-needed.patch
deleted file mode 100644
index 06c3ddd5..00000000
--- a/net-dialup/wvdial/files/wvdial-1.61-as-needed.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- wvdial-1.60/Makefile.in 2008-12-14 17:18:25.000000000 +0100
-+++ wvdial-1.60/Makefile.in 2008-12-14 17:20:13.000000000 +0100
-@@ -15,10 +15,12 @@
- ifeq ($(PC_LIBS),)
- $(error WvStreams does not appear to be installed)
- endif
- LIBS+=$(PC_LIBS)
-
-+wvdial-LIBS+= -luniconf
-+
- BINDIR=${prefix}/bin
- MANDIR=${prefix}/share/man
- PPPDIR=${DESTDIR}/etc/ppp/peers
-
- include wvrules.mk
diff --git a/net-dialup/wvdial/files/wvdial-1.61-destdir.patch b/net-dialup/wvdial/files/wvdial-1.61-destdir.patch
deleted file mode 100644
index ceea4005..00000000
--- a/net-dialup/wvdial/files/wvdial-1.61-destdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-=== modified file 'Makefile.in'
---- a/Makefile.in 2010-05-27 13:08:26 +0000
-+++ b/Makefile.in 2010-05-27 13:08:41 +0000
-@@ -3,7 +3,7 @@
- WVPACKAGE_TARNAME=@PACKAGE_TARNAME@
- WVPACKAGE_VERSION=@PACKAGE_VERSION@
-
--prefix=/usr/local
-+prefix=${DESTDIR}/usr
- WVSTREAMS_INC=
- WVSTREAMS_LIB=
- WVSTREAMS_BIN=$(prefix)/bin
-@@ -23,7 +23,7 @@
-
- BINDIR=${prefix}/bin
- MANDIR=${prefix}/share/man
--PPPDIR=/etc/ppp/peers
-+PPPDIR=${DESTDIR}/etc/ppp/peers
-
- include wvrules.mk
-
-
-=== modified file 'config.defaults.mk'
---- a/config.defaults.mk 2010-05-27 13:08:26 +0000
-+++ b/config.defaults.mk 2010-05-27 13:43:03 +0000
-@@ -13,7 +13,7 @@
- LIBS_PAM=-lpam
- LIBS_TCL=
-
--prefix=/usr/local
-+prefix=${DESTDIR}/usr
- datadir=${prefix}/share
- includedir=${prefix}/include
- infodir=${prefix}/share/info
-
diff --git a/net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch b/net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch
deleted file mode 100644
index 4c0c8370..00000000
--- a/net-dialup/wvdial/files/wvdial-1.61-parallel-make.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- wvdial-1.61/wvrules-posix.mk
-+++ wvdial-1.61/wvrules-posix.mk
-@@ -85,12 +85,15 @@
- $(AR) s $1
- endef
-
--CC: FORCE
-+CC:
- @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- $(WVSTREAMS_SRC)/gen-cc CC c
-
--CXX: FORCE
-+CXX:
- @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- $(WVSTREAMS_SRC)/gen-cc CXX cc
-
-+#All files must depend on the above two rules. This is a godawful hack.
-+$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
-+
- wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
diff --git a/net-dialup/wvdial/metadata.xml b/net-dialup/wvdial/metadata.xml
deleted file mode 100644
index 1dd65a58..00000000
--- a/net-dialup/wvdial/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="google-code">wvstreams</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-dialup/wvdial/wvdial-1.61.ebuild b/net-dialup/wvdial/wvdial-1.61.ebuild
deleted file mode 100644
index 8b4cbf2d..00000000
--- a/net-dialup/wvdial/wvdial-1.61.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="mirror"
-inherit readme.gentoo-r1
-
-DESCRIPTION="Excellent program to automatically configure PPP sessions"
-HOMEPAGE="https://code.google.com/archive/p/wvstreams/"
-SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE=""
-
-COMMON_DEPEND=">=net-libs/wvstreams-4.4"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- net-dialup/ppp:=
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-destdir.patch"
- "${FILESDIR}/${P}-as-needed.patch"
- "${FILESDIR}/${P}-parallel-make.patch"
-# possibly unfixed: https://bugs.gentoo.org/show_bug.cgi?id=611028
-)
-
-DOC_CONTENTS="
- Use wvdialconf to automagically generate a configuration file.
- Users have to be member of the dialout AND the uucp group to use
- wvdial
-"
-
-src_configure() {
- # Hand made configure...
- ./configure || die
-}
-
-src_install() {
- default
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
deleted file mode 100644
index 0d884b5a..00000000
--- a/net-libs/wvstreams/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wvstreams-4.6.1.tar.gz 1118456 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
deleted file mode 100644
index b2c2efd5..00000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-fix-c++14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix building with C++14, which errors out due to explicit operator bool() conversion
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594058
-
---- a/streams/wvstream.cc
-+++ b/streams/wvstream.cc
-@@ -907,9 +907,9 @@
-
- if (forceable)
- {
-- si.wants.readable = readcb;
-- si.wants.writable = writecb;
-- si.wants.isexception = exceptcb;
-+ si.wants.readable = static_cast<bool>(readcb);
-+ si.wants.writable = static_cast<bool>(writecb);
-+ si.wants.isexception = static_cast<bool>(exceptcb);
- }
- else
- {
-@@ -1019,7 +1019,7 @@
-
- IWvStream::SelectRequest WvStream::get_select_request()
- {
-- return IWvStream::SelectRequest(readcb, writecb, exceptcb);
-+ return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
-
-
-@@ -1107,7 +1107,7 @@
- // inefficient, because if the alarm was expired then pre_select()
- // returned true anyway and short-circuited the previous select().
- TRACE("hello-%p\n", this);
-- return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
-+ return !alarm_was_ticking || select(0, static_cast<bool>(readcb), static_cast<bool>(writecb), static_cast<bool>(exceptcb));
- }
-
-
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
deleted file mode 100644
index b284da8f..00000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bugs.gentoo.org/419563
-http://bugs.gentoo.org/419971
-
-See -gcc47-patch and -magic.patch in Fedora git:
-
-http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
-
---- include/wvtask.h
-+++ include/wvtask.h
-@@ -45,7 +45,8 @@
- typedef void TaskFunc(void *userdata);
-
- static int taskcount, numtasks, numrunning;
-- int magic_number, *stack_magic;
-+ int volatile magic_number;
-+ int *stack_magic;
- WvString name;
- int tid;
-
-@@ -84,7 +85,7 @@
- static WvTaskMan *singleton;
- static int links;
-
-- static int magic_number;
-+ static int volatile magic_number;
- static WvTaskList all_tasks, free_tasks;
-
- static void get_stack(WvTask &task, size_t size);
---- include/wvuid.h
-+++ include/wvuid.h
-@@ -7,6 +7,7 @@
- #ifndef __WVUID_H
- #define __WVUID_H
-
-+#include <unistd.h>
- #include "wvstring.h"
-
- #if WIN32
---- utils/wvtask.cc
-+++ utils/wvtask.cc
-@@ -58,7 +58,8 @@
- int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning;
-
- WvTaskMan *WvTaskMan::singleton;
--int WvTaskMan::links, WvTaskMan::magic_number;
-+int WvTaskMan::links;
-+int volatile WvTaskMan::magic_number;
- WvTaskList WvTaskMan::all_tasks, WvTaskMan::free_tasks;
- ucontext_t WvTaskMan::stackmaster_task, WvTaskMan::get_stack_return,
- WvTaskMan::toplevel;
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
deleted file mode 100644
index 473d3e83..00000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/333301
-
---- ipstreams/wvunixdgsocket.cc
-+++ ipstreams/wvunixdgsocket.cc
-@@ -1,5 +1,5 @@
- #include "wvunixdgsocket.h"
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #endif
---- streams/wvatomicfile.cc
-+++ streams/wvatomicfile.cc
-@@ -11,7 +11,8 @@
- #include "wvfileutils.h"
- #include "wvstrutils.h"
-
--#ifdef MACOS
-+#if defined(MACOS) || defined(__GNUC__)
-+#include <sys/types.h>
- #include <sys/stat.h>
- #endif
-
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
deleted file mode 100644
index c27e7233..00000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/304283
-
---- crypto/wvx509.cc
-+++ crypto/wvx509.cc
-@@ -1157,7 +1157,11 @@
-
- if (ext)
- {
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#else
- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext);
-+#endif
- if (!method)
- {
- WvDynBuf buf;
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.1.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.1.0.patch
deleted file mode 100644
index 6a06731e..00000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.1.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# https://bugs.gentoo.org/show_bug.cgi?id=614810
-# https://build.opensuse.org/package/view_file/openSUSE:Factory:ARM/wvstreams/wvstreams-openssl.patch
---- 1/crypto/wvblowfish.cc
-+++ 1/crypto/wvblowfish.cc
-@@ -77,7 +77,8 @@
- // if flushing on encryption, add some randomized padding
- size_t padlen = 8 - remainder;
- unsigned char *pad = in.alloc(padlen);
-- RAND_pseudo_bytes(pad, padlen);
-+ if (RAND_bytes(pad, padlen) != 1)
-+ return false;
- len += 8;
- }
- else // nothing we can do here, flushing does not make sense!
---- 1/crypto/wvtripledes.cc
-+++ 1/crypto/wvtripledes.cc
-@@ -78,6 +78,8 @@
- size_t padlen = 8 - remainder;
- unsigned char *pad = in.alloc(padlen);
- RAND_pseudo_bytes(pad, padlen);
-+ if(RAND_bytes(pad, padlen) != 1)
-+ return false;
- len += 8;
- }
- else // nothing we can do here, flushing does not make sense!
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch
deleted file mode 100644
index d6f7d6e7..00000000
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -131,12 +131,19 @@
- # libwvstreams: stream/event handling library
- #
- TARGETS += libwvstreams.so
--TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest
-+TARGETS += crypto/tests/ssltest
-+crypto/tests/ssltest: $(LIBWVSTREAMS)
-+
-+TARGETS += ipstreams/tests/unixtest
-+ipstreams/tests/unixtest: $(LIBWVSTREAMS)
-+
- TARGETS += crypto/tests/printcert
-+crypto/tests/printcert: $(LIBWVSTREAMS)
-
- ifndef _MACOS
- ifneq ("$(with_readline)", "no")
- TARGETS += ipstreams/tests/wsd
-+ ipstreams/tests/wsd: $(LIBWVSTREAMS)
- ipstreams/tests/wsd-LIBS += -lreadline
- else
- TEST_SKIP_OBJS += ipstreams/tests/wsd
-@@ -179,7 +186,11 @@
- #
- ifneq ("$(with_dbus)", "no")
- TARGETS += libwvdbus.so
-- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd
-+ TARGETS += dbus/tests/wvdbus
-+ dbus/tests/wvdbus: $(LIBWVDBUS)
-+
-+ TARGETS += dbus/tests/wvdbusd
-+ dbus/tests/wvdbusd: $(LIBWVDBUS)
- TESTS += $(call tests_cc,dbus/tests)
- libwvdbus_OBJS += $(call objects,dbus)
- libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
---- wvrules-posix.mk
-+++ wvrules-posix.mk
-@@ -85,12 +85,15 @@
- $(AR) s $1
- endef
-
--CC: FORCE
-+CC:
- @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- $(WVSTREAMS)/gen-cc CC c
-
--CXX: FORCE
-+CXX:
- @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- $(WVSTREAMS)/gen-cc CXX cc
-
-+#All files must depend on the above two rules. This is a godawful hack.
-+$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
-+
- wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
deleted file mode 100644
index 048f0f83..00000000
--- a/net-libs/wvstreams/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="google-code">wvstreams</remote-id>
- </upstream>
- <use>
- <flag name="boost">
- Use <pkg>dev-libs/boost</pkg> to provide TR1-compatible
- functional interface. This USE flag is only needed with GCC
- earlier than version 4.1, or with other compilares not providing
- said interface.
- </flag>
- </use>
-</pkgmetadata>
diff --git a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild b/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
deleted file mode 100644
index 428f633c..00000000
--- a/net-libs/wvstreams/wvstreams-4.6.1-r3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="mirror"
-inherit autotools flag-o-matic toolchain-funcs versionator
-
-# Unfixed: https://bugs.gentoo.org/show_bug.cgi?id=614810
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="https://wvstreams.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE="pam doc +ssl +dbus debug boost"
-
-#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
-RESTRICT="test"
-
-#QA Fail: xplc is compiled as a part of wvstreams.
-#It'll take a larger patching effort to get it extracted, since upstream integrated it
-#more tightly this time. Probably for the better since upstream xplc seems dead.
-
-RDEPEND="sys-libs/readline:0=
- sys-libs/zlib
- dbus? ( >=sys-apps/dbus-1.4.20 )
- dev-libs/openssl:0=
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- boost? ( >=dev-libs/boost-1.34.1:= )"
-
-DOCS="ChangeLog README*"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} == "binary" ]] && return
-
- if ! use boost && ! version_is_at_least 4.1 "$(gcc-fullversion)"; then
- eerror "This package requires the active gcc to be at least version 4.1"
- eerror "or USE=boost must be installed."
- die "Please activate >=sys-devel/gcc-4.1 with gcc-config."
- fi
-}
-
-src_prepare() {
- eapply -p0 "${FILESDIR}"/${P}-parallel-make.patch \
- "${FILESDIR}"/${P}-openssl-1.0.0.patch \
- "${FILESDIR}"/${P}-glibc212.patch \
- "${FILESDIR}"/${P}-gcc47.patch
- eapply "${FILESDIR}"/${P}-fix-c++14.patch
-
- sed -i \
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
- configure.ac argp/configure.ac || die
-
- default
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
- tc-export AR CXX
-
- use boost && export ac_cv_header_tr1_functional=no
-
- econf \
- --localstatedir=/var \
- $(use_enable debug) \
- --disable-optimization \
- $(use_with dbus) \
- --with-openssl \
- $(use_with pam) \
- --without-tcl \
- --without-qt \
- --with-zlib \
- --without-valgrind
-}
-
-src_compile() {
- default
-
- if use doc; then
- doxygen || die
- fi
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- default
-
- if use doc; then
- #the list of files is too big for dohtml -r Docs/doxy-html/*
- cd Docs/doxy-html
- dodoc -r *
- fi
-}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f5217a60..36b15862 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -163,7 +163,6 @@ media-tv/sundtek-tv:ld-preload-file - Install /etc/ld.so.preload
media-tv/sundtek-tv:pax_kernel - Mark package which is necessary if you use a PAX kernel
media-tv/w_scan:plp-id-zero - Apply experimental patch to force plp_id to 0 for DVB-T2. Seems to be necessary at least with some tuners in some regions
net-dns/noip-updater:ezipupd - Use user/group ezipupd instead of nobody: Useful if you restrict outgoing network traffic for user nobody
-net-libs/wvstreams:boost - Use dev-libs/boost to provide TR1-compatible functional interface. This USE flag is only needed with GCC earlier than version 4.1, or with other compilares not providing said interface.
net-misc/sshstart:keychain - Pull in keychain as dependency. Not required, but recommended for smoother operation.
net-print/foo2zjs:foo2zjs_devices_hp1000 - HP LJ 1000 firmware
net-print/foo2zjs:foo2zjs_devices_hp1005 - HP LJ 1005 firmware
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index dd9470f9..6d4d5000 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,2 +1,3 @@
DIST motif-2.3.6-patches-2.tar.xz 1600 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
DIST motif-2.3.7.tar.gz 5715478 SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
+DIST motif-2.3.8.tar.gz 5704328 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
diff --git a/x11-libs/motif/motif-2.3.8.ebuild b/x11-libs/motif/motif-2.3.8.ebuild
new file mode 100644
index 00000000..70719860
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="https://sourceforge.net/projects/motif/
+ http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
+ https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+ unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ xft? (
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ || ( sys-devel/bison dev-util/byacc sys-freebsd/freebsd-ubin )
+ x11-misc/xbitmaps"
+
+src_prepare() {
+ eapply ../patch
+ eapply_user
+
+ # disable compilation of demo binaries
+ sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+ # add X.Org vendor string to aliases for virtual bindings
+ echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+ AT_M4DIR=. eautoreconf
+
+ # get around some LANG problems in make (#15119)
+ LANG=C
+
+ # bug #80421
+ filter-flags -ftracer
+
+ # feel free to fix properly if you care
+ append-flags -fno-strict-aliasing
+
+ # for Solaris Xos_r.h :(
+ [[ ${CHOST} == *-solaris2.11 ]] \
+ && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+ if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
+ && use unicode; then
+ # libiconv detection in configure script doesn't always work
+ # http://bugs.motifzone.net/show_bug.cgi?id=1423
+ export LIBS="${LIBS} -liconv"
+ fi
+
+ # "bison -y" causes runtime crashes #355795
+ command -v byacc >/dev/null 2>&1 && export YACC=byacc
+
+ # remember the name of the C compiler for the native ABI
+ MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --with-x \
+ $(use_enable static-libs static) \
+ $(use_enable motif22-compatibility) \
+ $(use_enable unicode utf8) \
+ $(use_enable xft) \
+ $(use_enable jpeg) \
+ $(use_enable png)
+}
+
+multilib_src_compile() {
+ # The wmluiltok build tool is linked with libfl.a, so always
+ # compile it for the native ABI
+ emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+ emake
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi && use examples; then
+ emake -C demos DESTDIR="${D}" install-data
+ dodir /usr/share/doc/${PF}/demos
+ mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+ fi
+}
+
+multilib_src_install_all() {
+ # mwm default configs
+ insinto /usr/share/X11/app-defaults
+ newins "${FILESDIR}"/Mwm.defaults Mwm
+
+ # cleanup
+ rm -rf "${ED}"/usr/share/Xm
+ prune_libtool_files
+
+ dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}