diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 244e890b1ea6..7cb5196abee2 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,2 +1,3 @@
DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 WHIRLPOOL 0a1c00b07898aa7a5d78865fb73c6d26c6331dd0a4945773a801d29e40298b365eb58cae113a95fcf73be678a24ac082ad0868e8051303d732882fb82a859a7b
DIST lirc-0.9.4a.tar.bz2 2292119 SHA256 386086a74c7d12e7e8f26f7dbc8f40d20b9968c9ad2a42599483a51dd2da03ba SHA512 16be0ac5dd9b07d717ceba63cdc38c0db4a2bdcfc373ca6346d7cd4ab2cd2973aa7585d10b045fcaea952a3aabf7617c564ccb8268db6c62b172683a4b2cc188 WHIRLPOOL 93431c43d2dd31081e97113e2d49134de7feb29be53508900b3360408f7a099becf169fcebd0f6fc196280c594dc83d1299617ee54b65452828492db9bcd09ad
+DIST lirc-0.9.4c.tar.bz2 2311300 SHA256 8974fe5dc8eaa717daab6785d2aefeec27615f01ec24b96d31e3381b2f70726a SHA512 0a0d0e025b87a55ec919c92824d8288bfaf35cfebae0ee97d86e344109f584baa72a2eff6d24fbc526900671d6092e0eebef8d1566559b0d153e122e3127c0cb WHIRLPOOL a614fc10b0e40831e81c558439ea528ae0628d64e55b272b9b5a97cb93cba2b8759062a5258c732fa97c2be7966226c3aca2efe2de84aad1f62211146d202efc
diff --git a/app-misc/lirc/lirc-0.9.4c.ebuild b/app-misc/lirc/lirc-0.9.4c.ebuild
new file mode 100644
index 000000000000..a3cc9965aba5
--- /dev/null
+++ b/app-misc/lirc/lirc-0.9.4c.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit eutils flag-o-matic python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+ SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+ SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="audio doc ftdi gtk inputlirc static-libs systemd usb X"
+
+REQUIRED_USE="
+ gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ audio? (
+ >media-libs/portaudio-18
+ media-libs/alsa-lib
+ )
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ftdi? ( dev-embedded/libftdi:0 )
+ systemd? ( sys-apps/systemd )
+ usb? ( virtual/libusb:0 )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ )
+"
+
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/libxslt
+ doc? ( app-doc/doxygen )
+ sys-apps/kmod
+ sys-kernel/linux-headers
+"
+
+RDEPEND="
+ ${COMMON_DEPEND}
+ gtk? (
+ x11-libs/vte[introspection]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ )
+ inputlirc? ( app-misc/inputlircd )
+"
+
+PATCHES=(
+ # https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
+ "${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
+)
+
+src_configure() {
+ xdg_environment_reset
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ $(use_enable static-libs static) \
+ $(use_with X x)
+}
+
+src_install() {
+ default
+
+ if use !gtk ; then
+ # lirc-setup requires gtk
+ rm "${ED%/}"/usr/bin/lirc-setup || die
+ fi
+
+ newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+ newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+ newconfd "${FILESDIR}"/lircd.conf.4 lircd
+ newconfd "${FILESDIR}"/lircmd.conf lircmd
+
+ insinto /etc/modprobe.d/
+ newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+ newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+ newconfd "${FILESDIR}"/irexec-confd irexec
+
+ keepdir /etc/lirc
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+
+ # Avoid QA notice
+ rm -d "${ED%/}"/var/run/lirc || die
+ rm -d "${ED%/}"/var/run || die
+}
+
+pkg_preinst() {
+ local dir="${EROOT%/}/etc/modprobe.d"
+ if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+ elog "Renaming ${dir}/lirc to lirc.conf"
+ mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+ fi
+
+ # copy the first file that can be found
+ if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
+ cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
+ cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+ MOVE_OLD_LIRCD_CONF=1
+ elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+ fi
+
+ # stop portage from touching the config file
+ if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+ rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+ fi
+}
+
+pkg_postinst() {
+ # copy config file to new location
+ # without portage knowing about it
+ # so it will not delete it on unmerge or ever touch it again
+ if [[ -e "${T}"/lircd.conf ]]; then
+ cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+ if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+ elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+ rm -f "${EROOT%/}"/etc/lircd.conf || die
+ fi
+ fi
+
+ einfo "The new default location for lircd.conf is inside of"
+ einfo "${EROOT%/}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 3d42ab331d67..e563da18aefe 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/metadata.xml
@@ -19,6 +19,7 @@
Support using an audio device connected to an IR receiver
Support iguanaIR devices
Support FTDI devices
+ Include GTK support which enables the use of lirc-setup
lirc
diff --git a/dev-libs/cryptlib/cryptlib-3.4.0-r2.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0-r2.ebuild
deleted file mode 100644
index 5f12f72b88a2..000000000000
--- a/dev-libs/cryptlib/cryptlib-3.4.0-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs
-
-MY_PV="${PV//.}"
-
-DESCRIPTION="Powerful security toolkit for adding encryption to software"
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
-DOC_PREFIX="${PN}-${PV}"
-SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
- doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
-
-LICENSE="Sleepycat"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc ldap odbc python"
-
-S="${WORKDIR}"
-
-RDEPEND="sys-libs/zlib
- ldap? ( net-nds/openldap )
- odbc? ( dev-db/unixODBC )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-src_unpack() {
- # we need the -a option, so we can not use 'unpack'
- unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
- use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
-}
-
-wrap_python() {
- if use python; then
- # cd bindings || die
-
- distutils-r1_${1}
- fi
-}
-
-src_prepare() {
- rm -fr zlib || die
-
- # we want our own CFLAGS ;-)
- sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \
- -e "s:-O3::g" -e "s:-O4::g" makefile || die "sed makefile failed"
- sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e "s/-mcpu=[[:alnum:]\.=-]*//g" \
- -e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed tools/ccopts.sh failed"
-
- # change 'make' to '$(MAKE)'
- sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed"
-
- # NOTICE:
- # Because of stack execution
- # assembly parts are disabled.
- sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed"
-
- # Fix version number of shared library.
- sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed"
-
- # Respect LDFLAGS and fix soname and strip issues.
- epatch "${FILESDIR}/${PN}-3.3.2-ld.patch"
-
- # Use external zlib.
- epatch "${FILESDIR}/${PN}-3.4.0-external-zlib.patch"
-
- # Fix setup.py
- epatch "${FILESDIR}"/${P}-python.patch
-
- # For some reason, setup.py is half-designed to be run from proper dir,
- # and half-designed to be run from root. Since the patch fixes it to
- # be completely from root, move it.
- #
- # When bumping the package, please update the patch to make setup.py work
- # properly when executed from 'bindings' subdirectory.
- mv bindings/setup.py . || die
-
- wrap_python ${FUNCNAME}
-}
-
-src_compile() {
- local libname="libcl.so.${PV}"
-
- # At least -O2 is needed.
- replace-flags -O -O2
- replace-flags -O0 -O2
- replace-flags -O1 -O2
- replace-flags -Os -O2
- is-flagq -O* || append-flags -O2
-
- append-flags "-D__UNIX__ -DOSVERSION=2 -DNDEBUG -I."
-
- if [ -f /usr/include/pthread.h -a \
- `grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then
- append-flags "-DHAS_RECURSIVE_MUTEX"
- fi
- if [ -f /usr/include/pthread.h -a \
- `grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then
- append-flags "-DHAS_ROBUST_MUTEX"
- fi
-
- use ldap && append-flags -DHAS_LDAP
- use odbc && append-flags -DHAS_ODBC
-
- emake directories
- emake toolscripts
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" Linux
-
- emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} -fPIC -c" Linux
-
- if use python; then
- ln -s libcl.so.${PV} libcl.so || die
-
- # Python bindings don't work with -O2 and higher.
- replace-flags -O* -O1
-
- wrap_python ${FUNCNAME}
- fi
-}
-
-src_install() {
- dolib.so "libcl.so.${PV}"
- dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
- dolib.a "libcl.a"
-
- doheader cryptlib.h
-
- dodoc README
- if use doc; then
- newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
- fi
-
- wrap_python ${FUNCNAME}
-}
diff --git a/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild
index 8902c50027d3..7c8d48ad9da4 100644
--- a/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.4.3-r1.ebuild
@@ -31,6 +31,11 @@ RDEPEND="sys-libs/zlib
DEPEND="${RDEPEND}
app-arch/unzip"
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+ "${FILESDIR}/${P}-zlib.patch"
+)
+
src_unpack() {
# we need the -a option, so we can not use 'unpack'
unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
@@ -66,12 +71,6 @@ src_prepare() {
# Fix version number of shared library.
sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed"
- # Respect LDFLAGS and fix soname and strip issues.
- epatch "${FILESDIR}/${P}-build.patch"
-
- # Use external zlib.
- epatch "${FILESDIR}/${P}-zlib.patch"
-
wrap_python ${FUNCNAME}
}
diff --git a/dev-libs/cryptlib/cryptlib-3.4.3.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3.ebuild
deleted file mode 100644
index 26b4fade0d32..000000000000
--- a/dev-libs/cryptlib/cryptlib-3.4.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs versionator
-
-MY_PV="${PV//.}"
-
-DESCRIPTION="Powerful security toolkit for adding encryption to software"
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
-DOC_PREFIX="${PN}-$(get_version_component_range 1-2 ${PV}).0"
-SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
- doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
-
-LICENSE="Sleepycat"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc ldap odbc python"
-
-S="${WORKDIR}"
-
-RDEPEND="sys-libs/zlib
- ldap? ( net-nds/openldap )
- odbc? ( dev-db/unixODBC )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-src_unpack() {
- # we need the -a option, so we can not use 'unpack'
- unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
- use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
-}
-
-wrap_python() {
- if use python; then
- cd bindings || die
- distutils-r1_${1}
- fi
-}
-
-src_prepare() {
- rm -fr zlib || die
-
- # we want our own CFLAGS ;-)
- sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \
- -e "s:-O3::g" -e "s:-O4::g" makefile || die "sed makefile failed"
- sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e "s/-mcpu=[[:alnum:]\.=-]*//g" \
- -e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed tools/ccopts.sh failed"
-
- # change 'make' to '$(MAKE)'
- sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed"
-
- # NOTICE:
- # Because of stack execution
- # assembly parts are disabled.
- sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed"
-
- # Fix version number of shared library.
- sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed"
-
- # Respect LDFLAGS and fix soname and strip issues.
- epatch "${FILESDIR}/${P}-build.patch"
-
- # Use external zlib.
- epatch "${FILESDIR}/${P}-zlib.patch"
-
- wrap_python ${FUNCNAME}
-}
-
-src_compile() {
- local libname="libcl.so.${PV}"
-
- # At least -O2 is needed.
- replace-flags -O -O2
- replace-flags -O0 -O2
- replace-flags -O1 -O2
- replace-flags -Os -O2
- is-flagq -O* || append-flags -O2
-
- append-flags "-fPIC -D__UNIX__ -DOSVERSION=2 -DNDEBUG -I."
-
- if [ -f /usr/include/pthread.h -a \
- `grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then
- append-flags "-DHAS_RECURSIVE_MUTEX"
- fi
- if [ -f /usr/include/pthread.h -a \
- `grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then
- append-flags "-DHAS_ROBUST_MUTEX"
- fi
-
- use ldap && append-flags -DHAS_LDAP
- use odbc && append-flags -DHAS_ODBC
-
- emake directories
- emake toolscripts
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" STRIP=true Linux
-
- emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} -c" STRIP=true Linux
-
- if use python; then
- #ln -s libcl.so.${PV} libcl.so || die
-
- # Python bindings don't work with -O2 and higher.
- replace-flags -O* -O1
-
- wrap_python ${FUNCNAME}
- fi
-}
-
-src_install() {
- dolib.so "libcl.so.${PV}"
- dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
- dolib.a "libcl.a"
-
- doheader cryptlib.h
-
- dodoc README
- if use doc; then
- newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
- fi
-
- wrap_python ${FUNCNAME}
-}
diff --git a/games-emulation/nestopia/Manifest b/games-emulation/nestopia/Manifest
index 809f35aeae45..a13c7e27814a 100644
--- a/games-emulation/nestopia/Manifest
+++ b/games-emulation/nestopia/Manifest
@@ -1 +1,2 @@
DIST nestopia-1.46.2.tgz 1223407 SHA256 4a5065726ad9e7a120a2c6aa39b9c0904090119998a4d690d4deb5e374118fc0 SHA512 3aa87e98aa24b71e5feac5ffe8229e97d407fc0b14567b0ddbe7cc1eaca08a08f435a6fe294fbbd7066054befdfd27602db7c3c0577246b0e8addfe296404a23 WHIRLPOOL 25c43194797e5edca3abc5cb75dba126d9d246e9ab12270521e7fe6c13427b371ba9f92a71ed557271f159711411286b5ac5ab3fe06144760320531c33bf0c02
+DIST nestopia-1.47.tgz 1306183 SHA256 84624d30ab05d609db2734db0065616b268f79d4aa35f1cd90cb35ee8d96be0c SHA512 27155a82ca9631623c4800110371ec374de2c3d649d3274c9495b58ddede36bfb4a6f52e39552d55e0e90795cd779c3331c488c557aba6b738998e19f1d3bf72 WHIRLPOOL 4f30b66e1eb229419fa4862db2b3828cb983dcba9f0cac531f84e45a885db2bfdbb24cc33a87729f524922c42aa761d0294e53c5ffa00540dd20765a79e08c41
diff --git a/games-emulation/nestopia/files/nestopia-1.47-fix-buildsystem.patch b/games-emulation/nestopia/files/nestopia-1.47-fix-buildsystem.patch
new file mode 100644
index 000000000000..ed52eb189c99
--- /dev/null
+++ b/games-emulation/nestopia/files/nestopia-1.47-fix-buildsystem.patch
@@ -0,0 +1,120 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,34 +1,26 @@
+-CC ?= cc
+-CXX ?= c++
+-CXXFLAGS ?= -O3
+-CPPFLAGS += -DNST_PRAGMA_ONCE
+-CFLAGS = $(shell sdl2-config --cflags)
+-
+-INCLUDES = -Isource
++nestopia_CPPFLAGS = -DNST_PRAGMA_ONCE -Isource $(shell sdl2-config --cflags)
+ WARNINGS = -Wno-write-strings
+
+-LDFLAGS = -Wl,--as-needed
+-LIBS = -lstdc++ -lm -lz
+-LIBS += $(shell sdl2-config --libs)
++nestopia_LIBS = -lm -lz $(shell sdl2-config --libs)
+
+ UNAME := $(shell uname)
+
+ BIN = nestopia
+
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ BINDIR ?= $(PREFIX)/bin
+ DATADIR ?= $(PREFIX)/share/nestopia
+
+ ifneq ($(findstring MINGW,$(UNAME)),)
+- DEFINES = -D_MINGW
+- LDFLAGS += -mconsole
+- LIBS += -lepoxy -lopengl32
++ nestopia_CPPFLAGS += -D_MINGW
++ nestopia_LIBS += -mconsole
++ nestopia_LIBS += -lepoxy -lopengl32
+ else ifneq ($(findstring Darwin,$(UNAME)),)
+- DEFINES = -D_APPLE
+- DEFINES += -DDATADIR=\"$(DATADIR)\"
+- INCLUDES += -I/usr/local/include -I/usr/local/opt/libarchive/include
+- LDFLAGS = -Wl -L/usr/local/opt/libarchive/lib
+- LIBS += -larchive -lepoxy -lao
++ nestopia_CPPFLAGS += -D_APPLE
++ nestopia_CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
++ nestopia_CPPFLAGS += -I/usr/local/include -I/usr/local/opt/libarchive/include
++ nestopia_LIBS += -Wl -L/usr/local/opt/libarchive/lib
++ nestopia_LIBS += -larchive -lepoxy -lao
+ # GTK Stuff - Comment this section to disable GTK+
+ #CFLAGS += $(shell pkg-config --cflags gtk+-3.0)
+ #LIBS += $(shell pkg-config --libs gtk+-3.0)
+@@ -43,12 +35,12 @@
+ #WARNINGS += -Wno-deprecated-declarations
+ # end GTK
+ else
+- DEFINES = -DDATADIR=\"$(DATADIR)\"
+- LIBS += -larchive -lepoxy -lGL -lGLU -lao
++ nestopia_CPPFLAGS += -DDATADIR=\"$(DATADIR)\"
++ nestopia_LIBS += -larchive -lepoxy -lGL -lGLU -lao
+ # GTK Stuff - Comment this section to disable GTK+
+- CFLAGS += $(shell pkg-config --cflags gtk+-3.0)
+- LIBS += $(shell pkg-config --libs gtk+-3.0)
+- DEFINES += -D_GTK
++ nestopia_CPPFLAGS += $(shell pkg-config --cflags gtk+-3.0)
++ nestopia_LIBS += $(shell pkg-config --libs gtk+-3.0)
++ nestopia_CPPFLAGS += -D_GTK
+ IOBJS += objs/unix/gtkui/gtkui.o
+ IOBJS += objs/unix/gtkui/gtkui_archive.o
+ IOBJS += objs/unix/gtkui/gtkui_callbacks.o
+@@ -374,11 +366,11 @@
+
+ # Core rules
+ objs/core/%.o: source/core/%.cpp
+- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
++ $(CXX) $(nestopia_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(WARNINGS) -c $< -o $@
+
+ # Interface rules
+ objs/unix/%.o: source/unix/%.cpp
+- $(CXX) $(CXXFLAGS) $(INCLUDES) $(WARNINGS) $(DEFINES) $(CFLAGS) -c $< -o $@
++ $(CXX) $(nestopia_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(WARNINGS) -c $< -o $@
+
+ all: maketree $(BIN)
+
+@@ -392,19 +384,28 @@
+ @mkdir -p $@
+
+ $(BIN): $(OBJS) $(IOBJS)
+- $(CC) $(LDFLAGS) $^ $(LIBS) -o $(BIN)
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) $^ $(nestopia_LIBS) $(LIBS) -o $(BIN)
+
+ install:
+- mkdir -p $(BINDIR)
+- mkdir -p $(DATADIR)/icons
+- mkdir -p $(PREFIX)/share/pixmaps
+- install -m 0755 $(BIN) $(BINDIR)
+- install -m 0644 source/unix/icons/nestopia.desktop $(DATADIR)
+- install -m 0644 NstDatabase.xml $(DATADIR)
+- install -m 0644 source/unix/icons/*.png $(DATADIR)/icons
+- install -m 0644 source/unix/icons/*.svg $(DATADIR)/icons
+- install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps
+- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop
++ mkdir -p $(DESTDIR)$(BINDIR)
++ mkdir -p $(DESTDIR)$(DATADIR)
++ mkdir -p $(DESTDIR)$(PREFIX)/share/applications/
++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps
++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/96x96/apps
++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps
++ mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
++ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
++ install -m 0755 $(BIN) $(DESTDIR)$(BINDIR)
++ install -m 0644 NstDatabase.xml $(DESTDIR)$(DATADIR)
++ install -m 0644 source/unix/icons/nestopia.desktop $(DESTDIR)$(PREFIX)/share/applications/
++ install -m 0644 source/unix/icons/nestopia32.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/nestopia.png
++ install -m 0644 source/unix/icons/nestopia48.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/nestopia.png
++ install -m 0644 source/unix/icons/nestopia64.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/nestopia.png
++ install -m 0644 source/unix/icons/nestopia96.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/96x96/apps/nestopia.png
++ install -m 0644 source/unix/icons/nestopia128.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/nestopia.png
++ install -m 0644 source/unix/icons/*.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+
+ uninstall:
+ xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop
diff --git a/games-emulation/nestopia/files/nestopia-1.47-fix-c++14.patch b/games-emulation/nestopia/files/nestopia-1.47-fix-c++14.patch
new file mode 100644
index 000000000000..c63b9debbab2
--- /dev/null
+++ b/games-emulation/nestopia/files/nestopia-1.47-fix-c++14.patch
@@ -0,0 +1,43 @@
+Fix compiling with C++14 due to bit-shifting of negative integers.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=597364
+
+--- a/source/core/NstCore.hpp
++++ b/source/core/NstCore.hpp
+@@ -279,14 +279,14 @@
+ template
+ inline long signed_shl(T v,uint c)
+ {
+- enum {NATIVE = T(-7) << 1 == -14};
++ enum {NATIVE = T(-(7 << 1)) == -14};
+ return Helper::ShiftSigned::Left( v, c );
+ }
+
+ template
+ inline long signed_shr(T v,uint c)
+ {
+- enum {NATIVE = T(-7) >> 1 == -4 || T(-7) >> 1 == -3};
++ enum {NATIVE = T(-(7 >> 1)) == -4 || T(-(7 >> 1)) == -3};
+ return Helper::ShiftSigned::Right( v, c );
+ }
+
+--- a/source/unix/gtkui/gtkui.cpp
++++ b/source/unix/gtkui/gtkui.cpp
+@@ -438,7 +438,7 @@
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+- message);
++ "%s", message);
+ gtk_dialog_run(GTK_DIALOG(messagewindow));
+ gtk_widget_destroy(messagewindow);
+ }
+--- a/source/unix/gtkui/gtkui.h
++++ b/source/unix/gtkui/gtkui.h
+@@ -8,7 +8,6 @@
+ #elif _APPLE
+ #else
+ #include
+-#include
+ #endif
+
+ void gtkui_init(int argc, char *argv[]);
diff --git a/games-emulation/nestopia/nestopia-1.47.ebuild b/games-emulation/nestopia/nestopia-1.47.ebuild
new file mode 100644
index 000000000000..941373c3ff51
--- /dev/null
+++ b/games-emulation/nestopia/nestopia-1.47.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gnome2-utils toolchain-funcs
+
+MY_P=${P/ue/}
+DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
+HOMEPAGE="http://0ldsk00l.ca/nestopia/"
+SRC_URI="mirror://sourceforge/nestopiaue/${PV%.*}/${MY_P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+ app-arch/libarchive:=
+ media-libs/libao
+ media-libs/libsdl2[sound,joystick,video]
+ sys-libs/zlib
+ virtual/opengl
+ virtual/glu
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS changelog.txt README.md README.unix )
+HTML_DOCS=( readme.html )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.47-fix-buildsystem.patch
+ "${FILESDIR}"/${PN}-1.47-fix-c++14.patch
+)
+
+src_configure() {
+ tc-export CXX
+ use doc && HTML_DOCS+=( doc/. )
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.1-as-needed.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.1-as-needed.patch
deleted file mode 100644
index c89827be08e9..000000000000
--- a/media-libs/atlas-c++/files/atlas-c++-0.6.1-as-needed.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- Atlas/Makefile.am.old 2008-11-20 08:45:41.000000000 +0100
-+++ Atlas/Makefile.am 2008-11-20 08:45:52.000000000 +0100
-@@ -1,4 +1,4 @@
--SUBDIRS = Message Codecs Filters Net Objects Funky
-+SUBDIRS = . Message Codecs Filters Net Objects Funky
-
- INCLUDES = -I$(top_srcdir)
-
---- Atlas/Message/Makefile.am.old 2008-11-20 08:47:01.000000000 +0100
-+++ Atlas/Message/Makefile.am 2008-11-20 08:47:29.000000000 +0100
-@@ -5,6 +5,8 @@
-
- libAtlasMessage_0_6_la_LDFLAGS = $(INTERFACE_VERSION)
-
-+libAtlasMessage_0_6_la_LIBADD = ../libAtlas-0.6.la
-+
- libAtlasMessage_0_6_la_SOURCES = \
- Element.cpp MEncoder.cpp DecoderBase.cpp QueuedDecoder.cpp
-
---- Atlas/Codecs/Makefile.am.old 2008-11-20 08:49:49.000000000 +0100
-+++ Atlas/Codecs/Makefile.am 2008-11-20 08:52:45.000000000 +0100
-@@ -5,6 +5,8 @@
-
- libAtlasCodecs_0_6_la_LDFLAGS = $(INTERFACE_VERSION)
-
-+libAtlasCodecs_0_6_la_LIBADD = ../libAtlas-0.6.la
-+
- libAtlasCodecs_0_6_la_SOURCES = \
- Utility.cpp XML.cpp Packed.cpp Bach.cpp
-
---- Atlas/Filters/Makefile.am.old 2008-11-20 08:53:58.000000000 +0100
-+++ Atlas/Filters/Makefile.am 2008-11-20 08:55:21.000000000 +0100
-@@ -5,6 +5,8 @@
-
- libAtlasFilters_0_6_la_LDFLAGS = $(INTERFACE_VERSION)
-
-+libAtlasFilters_0_6_la_LIBADD = ../libAtlas-0.6.la -lz -lbz2
-+
- libAtlasFilters_0_6_la_SOURCES = \
- Bzip2.cpp Bzip2.h \
- Gzip.cpp Gzip.h
---- Atlas/Net/Makefile.am.old 2008-11-19 15:10:38.000000000 +0100
-+++ Atlas/Net/Makefile.am 2008-11-19 15:11:13.000000000 +0100
-@@ -5,6 +5,8 @@
-
- libAtlasNet_0_6_la_LDFLAGS = $(INTERFACE_VERSION)
-
-+libAtlasNet_0_6_la_LIBADD = ../Codecs/libAtlasCodecs-0.6.la ../libAtlas-0.6.la
-+
- libAtlasNetincludedir = $(includedir)/Atlas-C++-0.6/Atlas/Net
-
- libAtlasNet_0_6_la_SOURCES = \
---- Atlas/Objects/Makefile.am.old 2008-11-20 08:57:39.000000000 +0100
-+++ Atlas/Objects/Makefile.am 2008-11-20 08:58:56.000000000 +0100
-@@ -5,6 +5,8 @@
-
- libAtlasObjects_0_6_la_LDFLAGS = $(INTERFACE_VERSION)
-
-+libAtlasObjects_0_6_la_LIBADD = ../libAtlas-0.6.la ../Message/libAtlasMessage-0.6.la ../Codecs/libAtlasCodecs-0.6.la
-+
- REAL_GENERATED_CPP = Root.cpp Decoder.cpp Dispatcher.cpp objectFactory.cpp \
- RootEntity.cpp RootEntityChildren.cpp \
- RootOperation.cpp RootOperationChildren1.cpp \
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch
deleted file mode 100644
index 6ac1bc6e6194..000000000000
--- a/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Atlas/Filter.cpp.old 2008-04-14 23:55:23.000000000 +0200
-+++ Atlas/Filter.cpp 2008-04-14 23:57:04.000000000 +0200
-@@ -4,6 +4,8 @@
-
- #include
-
-+#include
-+
- namespace Atlas {
-
- Filter::Filter(Filter* next)
-@@ -41,7 +43,7 @@
-
- if (numPutback > m_inPutback) numPutback = m_inPutback;
-
-- std::memcpy(m_outBuffer + (m_inPutback - numPutback),
-+ ::memcpy(m_outBuffer + (m_inPutback - numPutback),
- gptr() - numPutback,
- (unsigned long) numPutback);
-
---- tools/atlas_convert.cpp.old 2008-04-14 23:58:53.000000000 +0200
-+++ tools/atlas_convert.cpp 2008-04-14 23:59:15.000000000 +0200
-@@ -14,6 +14,7 @@
- #include
- #include
-
-+#include
- #include
-
- int option_format = 0;
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.4.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.4.patch
deleted file mode 100644
index ed792935349a..000000000000
--- a/media-libs/atlas-c++/files/atlas-c++-0.6.1-gcc-4.4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Atlas/Filter.cpp.old 2009-07-06 09:58:04.000000000 +0200
-+++ Atlas/Filter.cpp 2009-07-06 09:58:44.000000000 +0200
-@@ -5,6 +5,7 @@
- #include
-
- #include
-+#include
-
- namespace Atlas {
-
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.1-strict-aliasing.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.1-strict-aliasing.patch
deleted file mode 100644
index edf1ac197755..000000000000
--- a/media-libs/atlas-c++/files/atlas-c++-0.6.1-strict-aliasing.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tests/Objects/Makefile.am.old 2008-02-29 07:43:45.000000000 +0100
-+++ tests/Objects/Makefile.am 2008-02-29 07:44:21.000000000 +0100
-@@ -28,3 +28,5 @@
- attributes_SOURCES = attributes.cpp
-
- flags_SOURCES = flags.cpp
-+
-+AM_CPPFLAGS = -fno-strict-aliasing
---- benchmark/Makefile.am.old 2008-02-29 07:57:10.000000000 +0100
-+++ benchmark/Makefile.am 2008-02-29 07:57:33.000000000 +0100
-@@ -31,3 +31,5 @@
-
- Objects_asMessage_SOURCES = Objects_asMessage.cpp timer.h
- Objects_iterator_SOURCES = Objects_iterator.cpp timer.h
-+
-+AM_CPPFLAGS = -fno-strict-aliasing
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.2-Werror.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.2-Werror.patch
deleted file mode 100644
index b13384ab5a12..000000000000
--- a/media-libs/atlas-c++/files/atlas-c++-0.6.2-Werror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac.old 2011-05-02 11:16:53.851733207 +0200
-+++ configure.ac 2011-05-02 11:17:18.489283901 +0200
-@@ -35,10 +35,10 @@
- if test "$enableval" = "yes"; then
- CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG"
- else
-- CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
-+ CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
- fi
- ],[
-- CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
-+ CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
- ]
- )
-
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 0161a13101d8..0de21d437f12 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2016 20:43:13 +0000
+Fri, 30 Dec 2016 22:43:23 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0161a13101d8..0de21d437f12 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2016 20:43:13 +0000
+Fri, 30 Dec 2016 22:43:23 +0000
diff --git a/metadata/md5-cache/app-misc/lirc-0.9.4c b/metadata/md5-cache/app-misc/lirc-0.9.4c
new file mode 100644
index 000000000000..2803dd64d4ef
--- /dev/null
+++ b/metadata/md5-cache/app-misc/lirc-0.9.4c
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
+DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
+EAPI=6
+HOMEPAGE=http://www.lirc.org/
+IUSE=audio doc ftdi gtk inputlirc static-libs systemd usb X python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) inputlirc? ( app-misc/inputlircd )
+REQUIRED_USE=gtk? ( X )
+SLOT=0
+SRC_URI=mirror://sourceforge/lirc/lirc-0.9.4c.tar.bz2
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=2814121f3e5e03a72ec97faf6f3dafba
diff --git a/metadata/md5-cache/dev-libs/cryptlib-3.4.0-r2 b/metadata/md5-cache/dev-libs/cryptlib-3.4.0-r2
deleted file mode 100644
index 50aa81e4eb46..000000000000
--- a/metadata/md5-cache/dev-libs/cryptlib-3.4.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) odbc? ( dev-db/unixODBC ) python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) app-arch/unzip
-DESCRIPTION=Powerful security toolkit for adding encryption to software
-EAPI=5
-HOMEPAGE=http://www.cs.auckland.ac.nz/~pgut001/cryptlib/
-IUSE=doc ldap odbc python python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Sleepycat
-RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) odbc? ( dev-db/unixODBC ) python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-SLOT=0
-SRC_URI=ftp://ftp.franken.de/pub/crypt/cryptlib/cl340.zip doc? ( mirror://gentoo/cryptlib-3.4.0-manual.pdf.bz2 )
-_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e908b10b080ab00204a965a95b11d5f9
diff --git a/metadata/md5-cache/dev-libs/cryptlib-3.4.3 b/metadata/md5-cache/dev-libs/cryptlib-3.4.3
deleted file mode 100644
index 83bcb461ffc9..000000000000
--- a/metadata/md5-cache/dev-libs/cryptlib-3.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) odbc? ( dev-db/unixODBC ) python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) app-arch/unzip
-DESCRIPTION=Powerful security toolkit for adding encryption to software
-EAPI=5
-HOMEPAGE=http://www.cs.auckland.ac.nz/~pgut001/cryptlib/
-IUSE=doc ldap odbc python python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Sleepycat
-RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) odbc? ( dev-db/unixODBC ) python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-SLOT=0
-SRC_URI=ftp://ftp.franken.de/pub/crypt/cryptlib/cl343.zip doc? ( mirror://gentoo/cryptlib-3.4.0-manual.pdf.bz2 )
-_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=67f50b0b6cc3bebfb550fcf4ffb0cfa5
diff --git a/metadata/md5-cache/dev-libs/cryptlib-3.4.3-r1 b/metadata/md5-cache/dev-libs/cryptlib-3.4.3-r1
index d519c243c80b..afc1d0e0838d 100644
--- a/metadata/md5-cache/dev-libs/cryptlib-3.4.3-r1
+++ b/metadata/md5-cache/dev-libs/cryptlib-3.4.3-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) odbc? ( dev-db/unixODBC ) pytho
SLOT=0
SRC_URI=ftp://ftp.franken.de/pub/crypt/cryptlib/cl343.zip doc? ( mirror://gentoo/cryptlib-3.4.0-manual.pdf.bz2 )
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=74f65745bdd068dbf22cc95fdccb7808
+_md5_=bbea2a9141ceffb1d3516efd04c6f29a
diff --git a/metadata/md5-cache/games-emulation/nestopia-1.47 b/metadata/md5-cache/games-emulation/nestopia-1.47
new file mode 100644
index 000000000000..5642bd3dec20
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/nestopia-1.47
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=app-arch/libarchive:= media-libs/libao media-libs/libsdl2[sound,joystick,video] sys-libs/zlib virtual/opengl virtual/glu x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A portable Nintendo Entertainment System emulator written in C++
+EAPI=6
+HOMEPAGE=http://0ldsk00l.ca/nestopia/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/libarchive:= media-libs/libao media-libs/libsdl2[sound,joystick,video] sys-libs/zlib virtual/opengl virtual/glu x11-libs/gtk+:3
+SLOT=0
+SRC_URI=mirror://sourceforge/nestopiaue/1/nestopia-1.47.tgz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=6b175da3088db96df0f79d2dd977e792
diff --git a/metadata/md5-cache/net-libs/libupnp-1.6.21 b/metadata/md5-cache/net-libs/libupnp-1.6.21
new file mode 100644
index 000000000000..81e2433c2bb8
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libupnp-1.6.21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An Portable Open Source UPnP Development Kit
+EAPI=6
+HOMEPAGE=http://pupnp.sourceforge.net/
+IUSE=debug doc ipv6 static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/pupnp/libupnp-1.6.21.tar.bz2
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=35626fc964615d6927719466722c5792
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.2 b/metadata/md5-cache/sys-devel/flex-2.6.3
similarity index 93%
rename from metadata/md5-cache/sys-devel/flex-2.6.2
rename to metadata/md5-cache/sys-devel/flex-2.6.3
index 9c2de69a1d12..f4b6092d7142 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.2
+++ b/metadata/md5-cache/sys-devel/flex-2.6.3
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=FLEX
RDEPEND=sys-devel/m4
SLOT=0
-SRC_URI=https://github.com/westes/flex/releases/download/v2.6.2/flex-2.6.2.tar.gz
+SRC_URI=https://github.com/westes/flex/releases/download/v2.6.3/flex-2.6.3.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
_md5_=f718bd4ef5c09db897eff7e116e7b18a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 0161a13101d8..0de21d437f12 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2016 20:43:13 +0000
+Fri, 30 Dec 2016 22:43:23 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6f21e2dcc6db..243012a4917d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec 30 20:39:24 UTC 2016
+Fri Dec 30 22:39:33 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 09548c60641f..31b8220c75f8 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2016 21:00:01 +0000
+Fri, 30 Dec 2016 23:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 558da00a55f3..4855de7aaee4 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1483130401 Fri 30 Dec 2016 08:40:01 PM UTC
+1483137601 Fri 30 Dec 2016 10:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0161a13101d8..0de21d437f12 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2016 20:43:13 +0000
+Fri, 30 Dec 2016 22:43:23 +0000
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index e5a9f40ce470..63ea80a790b3 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,3 +1,4 @@
DIST libupnp-1.6.18.tar.bz2 1201056 SHA256 b21bc676365622d3ace1b25292dab8d4d23f6e6a80ddc8f029b765d39797e934 SHA512 2ce9b637a7edf544ae272aea137f735b03761a7925da0578e0073cf6429389f7f2af6cb05f666a02faa839caba3e1798ad31657afd287626b88905a5c45f3cb4 WHIRLPOOL b575b517fb668c5e3af78dc1bc95c1a202404beb42966400b3b1313a1fe0e6cb8437ce392af6ad6de4ccc90715c8df7cc34bf3d0b3b828af4e14f1cc8a5e0eda
DIST libupnp-1.6.19.tar.bz2 1213439 SHA256 b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a SHA512 97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661 WHIRLPOOL fe3ed0115c76872b45eb3f16909e23c61b004f028b745be17346b94dffd7c90108420cf71f50f73aa4ef241403b65b9d1c72926af3044ffacdae11f9649dad68
DIST libupnp-1.6.20.tar.bz2 1243637 SHA256 ee3537081e3ea56f66ada10387486823989210bc98002f098305551c966e3a63 SHA512 754a3f587963078fc60e8a58f6b04536dac03d053c8cd14d4fd7e505a3417484fa03b72dd09ef92150f00263f270aa19646b7aab1b8707111aff53c43f8a120a WHIRLPOOL df2702b30a9e895371ba0647bfdd017fd17b4478feb691efaf754618fa032cb8ba72317030960676584da44dfc144f8b9bd07218799b40c2afa7fdee28e8b164
+DIST libupnp-1.6.21.tar.bz2 1245353 SHA256 af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb WHIRLPOOL b4869189054ac00d57394e0919ad2f672af64f2c2b0ecc676c2b3fc4a3c22caa25ac38b57bbb5cf1ef12a5857b4cdfd450c6bd5955a5eacaf8bdf95a058c9dab
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
new file mode 100644
index 000000000000..c48aedc7739d
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="debug doc ipv6 static-libs"
+
+DOCS="NEWS README ChangeLog"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.19-docs-install.patch
+)
+
+src_prepare() {
+ default
+
+ # fix tests
+ chmod +x ixml/test/test_document.sh || die
+
+ eautoreconf
+}
+
+src_configure() {
+ use x86-fbsd && append-flags -O1
+ # w/o docdir to avoid sandbox violations
+ econf \
+ $(use_enable debug) \
+ $(use_enable ipv6) \
+ $(use_enable static-libs static) \
+ $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
+}
+
+src_install () {
+ default
+ dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
+ use static-libs || prune_libtool_files
+}
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 0fcdbd71c0e5..8d05140d74e6 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -2,17 +2,13 @@
- maq@maqibooy.com
- Marcus Stjärnås
+ thev00d00@gentoo.org
+ Ian Whyman
gurligebis@gentoo.org
Bjarke Istrup Pedersen
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pupnp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2546a9cfa3c3..d9e61a030d7e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -845,6 +845,7 @@ app-misc/lcdproc:seamless-hbars - Try to avoid gaps in horizontal bars
app-misc/linux-logo:nls - Add Native Language Support (using gettext - GNU locale utilities)
app-misc/lirc:audio - Support using an audio device connected to an IR receiver
app-misc/lirc:ftdi - Support FTDI devices
+app-misc/lirc:gtk - Include GTK support which enables the use of lirc-setup
app-misc/lirc:hardware-carrier - The transmitter device generates its clock signal in hardware
app-misc/lirc:iguanair - Support iguanaIR devices
app-misc/lirc:inputlirc - Add a dependency on app-misc/inputlircd
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 70779ceb230e..a95665ed231c 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,3 @@
DIST flex-2.5.39.tar.xz 1347436 SHA256 c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec WHIRLPOOL 6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
DIST flex-2.6.1.tar.xz 835048 SHA256 2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1 WHIRLPOOL d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
-DIST flex-2.6.2.tar.gz 1402237 SHA256 9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9 SHA512 481fe3f1c370fe04d5a605a826c53dd0afa5b6ea655f0d14fa9bb9cb498c016f68cef8fea806458f07baa7ae5bc1ac729be427cb4e0cc39ce744a809ef6442b3 WHIRLPOOL 24d5b504c0e0bf58118fb358799906a49f2757b45a65a4a95618105dee4978a7e7c4348bd8fa4f6ef44ced24d0622ec702244c3692af2f214c11b0ba0ea510de
+DIST flex-2.6.3.tar.gz 1405560 SHA256 68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00 WHIRLPOOL 266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2
diff --git a/sys-devel/flex/flex-2.6.2.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
similarity index 100%
rename from sys-devel/flex/flex-2.6.2.ebuild
rename to sys-devel/flex/flex-2.6.3.ebuild