gentoo resync : 30.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-30 01:11:30 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-30 01:11:30 +0000
commit: 76dfef0cec9170000357d2f354e412daf48941fc (patch)
tree: 56647120c0ee20ab3494475c86722034cd194b02 /app-admin
parent: ccf84bcd604130256d1377cd58f0a634ae6ee20f (diff)
64 files changed, 761 insertions, 668 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0628b30fdaef..19939017c1d4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 4e54bb6ab43e..2347fbf5881a 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,8 +1,8 @@
 AUX apachetop-0.12.6-ac_config_header.patch 458 BLAKE2B 714adf5ee34629abae9cfe38d630e4e1c0829a99c823bc00a5276fe424264378316e18274976c71b974e970a25329413ab720f6621dcf3a6dcf61f02bc7d46d7 SHA512 dc10e46cac980a3544579222c5859d8baf4a1b5fd86a4700b07661e202270ff59b746b14661ca548d83322965e789bf70c7eddf8bf07b51d97d9e13256040109
 AUX apachetop-0.12.6-configure.patch 2884 BLAKE2B 34310a487b0dc68e184c9facce01d8ca95364c6c8ed041fa5ccf9dbbdce3ca4ac944fff91aafb4866e7086e8fd9ebeb961026f84bd3c77ccaabdbc5e1be97997 SHA512 7c399fd434476291504cd7674fe63559c59a7b32628477ad4fbd1386e936be4d1f49d4faa2d8d95839c74908e755d50400ab8f4f30163967b94dc058456c9c15
-AUX apachetop-0.12.6-gcc41.patch 243 BLAKE2B c9e13df4700b49d9ee6e96eab29a5a79462b8d955502a699ac0921115e2b80ed7bf64a4f88552fbc3f2d94b3ee7df7980a629892ff478e5012db920f37c5d682 SHA512 5aeff6bb7b08d792fc02526eb0c10491d217c11c157670d6b8380db4a748ca63c8c35dc8fb58851c6188ef2bd8da811a11fa556c3b3db513f77f3b785f927123
+AUX apachetop-0.12.6-gcc41.patch 247 BLAKE2B f193def780fc35322d49af0e13898a5dd95ecb49f8c0f4039260eb6b2aaf6e5a45131682d68d38f474d384b9d6d35c27a5233b57949da8b6ff54d29b9634c86e SHA512 710b8e3b381dcf9aac58544f9afe0f2a3cc598b38e87145caad29404fc19983bc683b160f0f80dd003ffa57d246fbc5b0fa5754aa1012e985b4c2ffc7e01f50f
 AUX apachetop-0.12.6-maxpathlen.patch 1577 BLAKE2B 97c046e1bf9f7cd67aaf95f9ed755bc3f12774756da35b31cd7b38db22b2860400bcbc9626a37ea795dc454c46b90dd2a53f41c42124e9d777a7da7a75da3a4c SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36
+AUX apachetop-0.12.6-ncurses.patch 5392 BLAKE2B bfbe54d1a3b32157cda1a22aba83829948233df7d18d6f54c9ec6f9b4e987c9c201d1bc5af43c3ce0edd8af5d83f14b229725f68b44e8e9ab202da961d628542 SHA512 2c4759a1a8c4a54fb10d75779c23bfadfdb789be1a790add29adc2cb9ba1829f57239da568057ddbfaf0cea5468a74a3fdf20b1fd35b0bf51e8c8ab9e6027b6d
 DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
-EBUILD apachetop-0.12.6-r1.ebuild 998 BLAKE2B 864fe883b2894c5c495e97fe88ce8370c6e057be4b0dbab2bdf5cc7c8fc242702cab60fd2fa1b315c8182b78bf3f518062c0223471ce98fa5af6dc17b795668d SHA512 52a9927874a2aea63c19983df262a4e0ec701ccf5a45531d99b835e2be4c3007963c1862a648c4b3ba7860a9cafb5ea12e49c9d24a45643d7999dffdb5a13b58
-EBUILD apachetop-0.12.6-r2.ebuild 796 BLAKE2B 99efe0544c2eda3878d1c97a216b2481203ecd4e7dd27d0cd3eee8095d345dddaa62e3b0190a296daa8d4fb6f294c1103bb14e3fdd4329cd9ab833a4c07077b3 SHA512 e9cfd9880a3ad4fd9b633dcc0aeab3fd967ed26cfb5854d2257a108a59d5fb5c64609edafb0b88389415a551551f435e8bdde50633369e788b29943595fd15b5
+EBUILD apachetop-0.12.6-r2.ebuild 891 BLAKE2B 78beb12571bac11da21de4f95b5267f4f8b2339cc75379e5e1b39d2b97b0bb5826b9dd015819d8a3f92aaf9af863ebabf93c6c88f144e83798246ecabb5a27bb SHA512 a1f79048bd8570b5f658d01e9b42c136251973500561d68aa09ab5e2fc54e758ce23e3bd1c3d745cad79d5a35f54baa4120cdf4b3e661231455c19dcea570c06
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
deleted file mode 100644
index 2b4638b436a1..000000000000
--- a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="http://www.webta.org/projects/apachetop"
-SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE="fam pcre adns"
-
-DEPEND="fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )
-	adns? ( net-libs/adns )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-maxpathlen.patch
-	epatch "${FILESDIR}"/${P}-ac_config_header.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-logfile=/var/log/apache2/access_log \
-		$(use_with fam) \
-		$(use_with pcre) \
-		$(use_with adns)
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
index bb433b83e580..bff79f6bb3b7 100644
--- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="A realtime Apache log analyzer"
 HOMEPAGE="http://www.webta.org/projects/apachetop"
@@ -14,22 +15,29 @@ KEYWORDS="amd64 hppa ~mips ppc sparc x86"
 IUSE="fam pcre"
 
 RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}"
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-maxpathlen.patch
+	"${FILESDIR}"/${P}-ac_config_header.patch
+	"${FILESDIR}"/${P}-ncurses.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-maxpathlen.patch
-	epatch "${FILESDIR}"/${P}-ac_config_header.patch
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--with-logfile=/var/log/apache2/access_log \
+		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
 		--without-adns \
 		$(use_with fam) \
 		$(use_with pcre)
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
index 566c9226a3f7..6bfb49d9f9d8 100644
--- a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
+++ b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
@@ -1,5 +1,5 @@
---- src/resolver.h
-+++ src/resolver.h
+--- a/src/resolver.h
++++ b/src/resolver.h
 @@ -10,8 +10,8 @@
  class Resolver
  {
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
new file mode 100644
index 000000000000..f12c989c3407
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
@@ -0,0 +1,166 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@
+ AC_CONFIG_SRCDIR(src/apachetop.cc)
+ 
+ AC_CONFIG_AUX_DIR(config)
+-#AC_CONFIG_MACRO_DIR(m4) # 2.58
++AC_CONFIG_MACRO_DIR(m4)
+ 
+ AC_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
+@@ -29,7 +29,6 @@
+ #AC_PROG_CC
+ #AC_PROG_CPP
+ AC_PROG_CXX
+-AC_LANG_CPLUSPLUS
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -120,24 +119,9 @@
+ 
+ AC_SEARCH_LIBS([socket], [socket])
+ AC_SEARCH_LIBS([inet_addr], [nsl])
+-AC_SEARCH_LIBS([attron], [ncurses])
+-AC_SEARCH_LIBS([tgetstr], [termcap])
+-AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
+-	[] ,
+-	[
+-		AC_MSG_ERROR([No useful curses library found!])
+-	]
+-)
+ 
+-AC_SEARCH_LIBS([readline], [readline],
+-	[
+-		AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
+-		AC_SUBST(HAVE_READLINE)
+-	] ,
+-	[
+-		AC_MSG_ERROR(readline library not found)
+-	]
+-)
++PKG_CHECK_MODULES([NCURSES], [ncurses])
++AX_LIB_READLINE
+ 
+ 
+ # everything is in CPPFLAGS up to this point, now we move to CXXFLAGS
+--- a/m4/ax_lib_readline.m4
++++ b/m4/ax_lib_readline.m4
+@@ -0,0 +1,107 @@
++# ===========================================================================
++#     https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_LIB_READLINE
++#
++# DESCRIPTION
++#
++#   Searches for a readline compatible library. If found, defines
++#   `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
++#   sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
++#   necessary include files and sets `HAVE_READLINE_H' or
++#   `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
++#   'HAVE_HISTORY_H' if the corresponding include files exists.
++#
++#   The libraries that may be readline compatible are `libedit',
++#   `libeditline' and `libreadline'. Sometimes we need to link a termcap
++#   library for readline to work, this macro tests these cases too by trying
++#   to link with `libtermcap', `libcurses' or `libncurses' before giving up.
++#
++#   Here is an example of how to use the information provided by this macro
++#   to perform the necessary includes or declarations in a C file:
++#
++#     #ifdef HAVE_LIBREADLINE
++#     #  if defined(HAVE_READLINE_READLINE_H)
++#     #    include <readline/readline.h>
++#     #  elif defined(HAVE_READLINE_H)
++#     #    include <readline.h>
++#     #  else /* !defined(HAVE_READLINE_H) */
++#     extern char *readline ();
++#     #  endif /* !defined(HAVE_READLINE_H) */
++#     char *cmdline = NULL;
++#     #else /* !defined(HAVE_READLINE_READLINE_H) */
++#       /* no readline */
++#     #endif /* HAVE_LIBREADLINE */
++#
++#     #ifdef HAVE_READLINE_HISTORY
++#     #  if defined(HAVE_READLINE_HISTORY_H)
++#     #    include <readline/history.h>
++#     #  elif defined(HAVE_HISTORY_H)
++#     #    include <history.h>
++#     #  else /* !defined(HAVE_HISTORY_H) */
++#     extern void add_history ();
++#     extern int write_history ();
++#     extern int read_history ();
++#     #  endif /* defined(HAVE_READLINE_HISTORY_H) */
++#       /* no history */
++#     #endif /* HAVE_READLINE_HISTORY */
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Ville Laurikari <vl@iki.fi>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 7
++
++AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
++AC_DEFUN([AX_LIB_READLINE], [
++  AC_CACHE_CHECK([for a readline compatible library],
++                 ax_cv_lib_readline, [
++    ORIG_LIBS="$LIBS"
++    for readline_lib in readline edit editline; do
++      for termcap_lib in "" termcap curses ncurses; do
++        if test -z "$termcap_lib"; then
++          TRY_LIB="-l$readline_lib"
++        else
++          TRY_LIB="-l$readline_lib -l$termcap_lib"
++        fi
++        LIBS="$ORIG_LIBS $TRY_LIB"
++        AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
++        if test -n "$ax_cv_lib_readline"; then
++          break
++        fi
++      done
++      if test -n "$ax_cv_lib_readline"; then
++        break
++      fi
++    done
++    if test -z "$ax_cv_lib_readline"; then
++      ax_cv_lib_readline="no"
++    fi
++    LIBS="$ORIG_LIBS"
++  ])
++
++  if test "$ax_cv_lib_readline" != "no"; then
++    LIBS="$LIBS $ax_cv_lib_readline"
++    AC_DEFINE(HAVE_LIBREADLINE, 1,
++              [Define if you have a readline compatible library])
++    AC_CHECK_HEADERS(readline.h readline/readline.h)
++    AC_CACHE_CHECK([whether readline supports history],
++                   ax_cv_lib_readline_history, [
++      ax_cv_lib_readline_history="no"
++      AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
++    ])
++    if test "$ax_cv_lib_readline_history" = "yes"; then
++      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
++                [Define if your readline library has \`add_history'])
++      AC_CHECK_HEADERS(history.h readline/history.h)
++    fi
++  fi
++])dnl
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,6 +6,7 @@
+                     display.cc hits_circle.cc timed_circle.cc filters.cc \
+ 		    resolver.cc
+ 
++apachetop_LDADD = $(NCURSES_LIBS)
+ 
+ noinst_HEADERS = apachetop.h log.h ohtbl.h map.h queue.h \
+                  display.h hits_circle.h circle.h timed_circle.h filters.h \
diff --git a/app-admin/aws-as-tools/Manifest b/app-admin/aws-as-tools/Manifest
index 5a6ab3e81904..a64037e8f4c5 100644
--- a/app-admin/aws-as-tools/Manifest
+++ b/app-admin/aws-as-tools/Manifest
@@ -1,3 +1,3 @@
 DIST AutoScaling-1.0.49.1.zip 12387808 BLAKE2B 7f43b3544b05f1adc196c28b7c2fc5c26ea84cb3d3bd7cf098d8413b98aac5d2908177ee5567aad6dbea96d1abbf60794c4450423de768c280a33cb4efdbbd1e SHA512 aefc4dfc970757062ca972c5d532485c9e28ceb771b6fa0a4fb2fe25460bd67e3023bcefde57f9852340b6015e7ab2771c49beb0826e1394710ea7eea94948ed
-EBUILD aws-as-tools-1.0.49.1.ebuild 1727 BLAKE2B 7cd5d58140ffc98728cf7f537cffd9c60fb2ef99d474ee19fa3bf624f04760c00d96464c70e22cb7f7d8cdc2f70d6004f2e611cd91dfd60ded9710845d85168e SHA512 62d8cc6ecab9d676e563642c2acbc6d3a89758d45c0aec9014d5a5c710ea9616405096ece2ab8c6f96df7ec4ee8122795e6916a07eca13790f9667aa6492b7c0
+EBUILD aws-as-tools-1.0.49.1.ebuild 1669 BLAKE2B 008f80572c8302b3fdce9385f7edd2c80c6bd8c7336a06eb13046f508dd4b0bb8bb01c9f882360c284e0b5036105dd86544a395b48d178d844969d1e21f68659 SHA512 5cf1ea6b4e08754b89b87e2ba1c672e61f4e1c9791abfaf3ecbee9e41ef4889164880aa957e48dc931e5a0dc3970cf96d08b1e322440f7be79efefaa9fc2f512
 MISC metadata.xml 456 BLAKE2B 7c623b757f291e6ff28618f87a39f47dcbaa1b7dec75d642a98fc4930b3b75089af8d0ae14b14e9e422ed0ff12716ba337606a58fc1d678547ad16991669f103 SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8
diff --git a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
index 38450b0e2f07..a9b3692c2a2a 100644
--- a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
+++ b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
@@ -1,44 +1,43 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="The API tools serve as the client interface to the Auto Scaling web service"
 HOMEPAGE="http://aws.amazon.com/developertools/2535"
 # SRC_URI="http://ec2-downloads.s3.amazonaws.com/AutoScaling-2011-01-01.zip"
 SRC_URI="mirror://sabayon/app-admin/AutoScaling-1.0.49.1.zip"
 
-S="${WORKDIR}/AutoScaling-${PV}"
-
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S="${WORKDIR}/AutoScaling-${PV}"
+
+src_prepare() {
+	default
+
 	find . -name '*.cmd' -delete || die
-	rm bin/as-cmd-2009-05-15
-	rm bin/service-2009-05-15
+	rm bin/{as-cmd,service}-2009-05-15 || die
 }
 
 src_install() {
-	dodir /opt/${PN}
 	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
+	doins -r lib/.
+
 	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_AUTO_SCALING_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	doexe bin/*
+
+	cat > "${T}"/99${PN} <<- EOF || die
+		AWS_AUTO_SCALING_HOME=/opt/${PN}
+		PATH=/opt/${PN}/bin
+		ROOTPATH=/opt/${PN}/bin
+	EOF
 	doenvd "${T}"/99${PN}
 
 	dodoc "THIRDPARTYLICENSE.TXT"
@@ -48,6 +47,7 @@ pkg_postinst() {
 	ewarn "Remember to run: env-update && source /etc/profile if you plan"
 	ewarn "to use these tools in a shell before logging out (or restarting"
 	ewarn "your login manager)"
+
 	elog
 	elog "You need to put the following in your ~/.bashrc replacing the"
 	elog "values with the full path to your AWS credentials file."
diff --git a/app-admin/aws-cw-tools/Manifest b/app-admin/aws-cw-tools/Manifest
index 6a5045c0ffe4..aa67c70b6e69 100644
--- a/app-admin/aws-cw-tools/Manifest
+++ b/app-admin/aws-cw-tools/Manifest
@@ -1,3 +1,3 @@
 DIST CloudWatch-1.0.12.1.zip 6156651 BLAKE2B 140dc28fa44423824f180f34ab05918068e941f31de3081c0ee7ae462ee8d63f26c4fdc838a9e677638a34609a215f52b83572980e488d34557d39d610c434e7 SHA512 881a428a2861b86196a691f24a3471058426f049170d16f067d7cc319712beb161c80041e9ae89339d5298ffbf2869c04509fbe4620cd60cc74658c8d3ab11ec
-EBUILD aws-cw-tools-1.0.12.1.ebuild 1671 BLAKE2B 28ee2388a0688108e3559422eedf7cf437efdde882d3bb51320ad943dbb29f381bc44ca78431f38ee6750390eccd313f7ad0286c8eb56e272daa94f46926fe57 SHA512 8cdfae8dec09e84c76e0b29bf308ac7d59ddf29b5978c24a515ef83671d964410d2aae8a7fef7d960780f865303998bddc94f161826847ad4c38373a79ca1209
+EBUILD aws-cw-tools-1.0.12.1.ebuild 1644 BLAKE2B 16edd301ca96cee51d87ec0949c36a07d3489e495020a7f8c63da072b46ec1168570ef9d41474c12c2de2da3c5d04bbae8a7be1c372434cbabe6cb8c35bb23d6 SHA512 a1d5b319c2389852bce354ee7fc7f460ac30042256a681964173dff877445d5bbd7f619c8e5d9574c260294a07d3b643f514852f637b37b5d3bce58263a19c5b
 MISC metadata.xml 456 BLAKE2B 7c623b757f291e6ff28618f87a39f47dcbaa1b7dec75d642a98fc4930b3b75089af8d0ae14b14e9e422ed0ff12716ba337606a58fc1d678547ad16991669f103 SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8
diff --git a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
index cef181338339..ab4c5fb5543e 100644
--- a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
+++ b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
@@ -1,42 +1,42 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="The API tools serve as the client interface to the Amazon CloudWatch web service"
 HOMEPAGE="http://aws.amazon.com/developertools/2534"
 # SRC_URI="http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip"
 SRC_URI="mirror://sabayon/${CATEGORY}/CloudWatch-${PV}.zip"
 
-S="${WORKDIR}/CloudWatch-${PV}"
-
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
 
-src_unpack() {
-	unpack ${A}
-	cd "$S"
+S="${WORKDIR}/CloudWatch-${PV}"
+
+src_prepare() {
+	default
 	find . -name '*.cmd' -delete || die
 }
 
 src_install() {
-	dodir /opt/${PN}
 	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
+	doins -r lib/.
+
 	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
+	doexe bin/*
 
 	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_CLOUDWATCH_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	cat - > "${T}"/99${PN} <<- EOF || die
+		AWS_CLOUDWATCH_HOME=/opt/${PN}
+		PATH=/opt/${PN}/bin
+		ROOTPATH=/opt/${PN}/bin
+	EOF
 	doenvd "${T}"/99${PN}
 
 	dodoc "THIRDPARTYLICENSE.TXT"
@@ -46,6 +46,7 @@ pkg_postinst() {
 	ewarn "Remember to run: env-update && source /etc/profile if you plan"
 	ewarn "to use these tools in a shell before logging out (or restarting"
 	ewarn "your login manager)"
+
 	elog
 	elog "You need to put the following in your ~/.bashrc replacing the"
 	elog "values with the full path to your AWS credentials file."
diff --git a/app-admin/aws-elb-tools/Manifest b/app-admin/aws-elb-tools/Manifest
index aaa455f90222..3ce8b7d4817e 100644
--- a/app-admin/aws-elb-tools/Manifest
+++ b/app-admin/aws-elb-tools/Manifest
@@ -1,4 +1,3 @@
 DIST ElasticLoadBalancing-1.0.15.1.zip 6717939 BLAKE2B deef8cfb32a9c0d3627af26f32430efbe27a7712acd7c5dd9b7e8947b7c16ac866cec64100dd1bc315c4a2729451d181da8d16f133ea81fc927452cce6cc4f9b SHA512 813f00d632b483a5ec98632d830be4b02fc1bc71aa7bd845faa477f7d05bda7c801e5d83992c111dfc136bf5e1204bf96b00a1c24e5b19438decb356d0841725
-EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1597 BLAKE2B 4fbff7e2d910af09ac36261761f616cf8e074da88b7abfb5b1589463768cadc161025a29b2cd3c90c2db1d7cc5097d1991987733283a83677b2bec997437dadd SHA512 e6713f7b785b47814b20b7bb27c5c87183f30ebca7622de0de778fa9dcb716a69c5a54f177ada999b266a8df081fdf8aab1fcbfe08d8225acd111572c1c04d19
-EBUILD aws-elb-tools-1.0.15.1.ebuild 1611 BLAKE2B 59f2197f963af6779f57109b855057147a9be257e19a3a483f2448fd3c7056bb711806ba25e6f7c33bd205ec6df863e4d168d19c7b9823980b5bc40dca20eb8b SHA512 5cf3b2bd5ff8c580d3adf1d144a01402cf55487ebd62ec25e9e2aaffacf32106eaa2e70b6be46a9bd6a125f8580ef2c295992651d410619f80a127f949b9ca0e
+EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1562 BLAKE2B 54ac1fd7d026dd4f58dc2d1a294efa97ca4f6c94c869a968cee44e104e31356be2309e931d1c764fa5d8e1b5a1ee2c10df49880fb8d223d6927ccc34e9432b62 SHA512 a443939e59330c71b6b360c0420d18649ea21c26eefb4f8da961295faed18242578354bc954c8d64359168308b8a3d1a2bb57116c515e1ea734e87ac17c01672
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
index c1738a3ffad9..7b6784456062 100644
--- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,15 +7,16 @@ DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web se
 HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536"
 SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
 
-S="${WORKDIR}/ElasticLoadBalancing-${PV}"
-
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
+
+S="${WORKDIR}/ElasticLoadBalancing-${PV}"
 
 src_prepare() {
 	default
@@ -23,27 +24,27 @@ src_prepare() {
 }
 
 src_install() {
-	dodir /opt/${PN}
 	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
+	doins -r lib/.
+
 	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_ELB_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	doexe bin/*
+
+	cat > "${T}"/99${PN} <<- EOF || die
+		AWS_ELB_HOME=/opt/${PN}
+		PATH=/opt/${PN}/bin
+		ROOTPATH=/opt/${PN}/bin
+	EOF
 	doenvd "${T}"/99${PN}
 
-	dodoc "THIRDPARTYLICENSE.TXT"
+	dodoc THIRDPARTYLICENSE.TXT
 }
 
 pkg_postinst() {
 	ewarn "Remember to run: env-update && source /etc/profile if you plan"
 	ewarn "to use these tools in a shell before logging out (or restarting"
 	ewarn "your login manager)"
+
 	elog
 	elog "You need to put the following in your ~/.bashrc replacing the"
 	elog "values with the full path to your AWS credentials file."
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
deleted file mode 100644
index 23ee15e13fe6..000000000000
--- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="Serves as the client interface to the Elastic Load Balancing web service"
-HOMEPAGE="http://aws.amazon.com/developertools/Amazon-EC2/2536"
-SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
-
-S="${WORKDIR}/ElasticLoadBalancing-${PV}"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-RESTRICT="mirror"
-
-src_unpack() {
-	unpack ${A}
-	cd "$S"
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
-	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_ELB_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc "THIRDPARTYLICENSE.TXT"
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
diff --git a/app-admin/aws-iam-tools/Manifest b/app-admin/aws-iam-tools/Manifest
index 93a0920b5f87..a8d7a2f10d53 100644
--- a/app-admin/aws-iam-tools/Manifest
+++ b/app-admin/aws-iam-tools/Manifest
@@ -1,3 +1,3 @@
 DIST IAMCli-1.3.0.zip 3957057 BLAKE2B b2e429c2fb3169e23d6e6fc4c4b33594f2814bf976d1c584551008561b71977a3ee4abafd50bd3e52592e918624da01b83527557d2079772d083fbe96ee52eb5 SHA512 5012ece2d0569545848d83cf879b4d05f7f955f22bbc31b86f3993e4f5ee48de3099369fddf7f2b2d98f89e56c8c329e427a1f7dca0afa728ea9593c1b36497c
-EBUILD aws-iam-tools-1.3.0.ebuild 1623 BLAKE2B 4ff825ffdff114cf600dc47557e4434419d67489af44f64e8c901c2232b617002a615d6d9b6ccd159fa119fc36b99863637efa9fb1dd96d6c8f837e812d8c15b SHA512 db74dd4808fa98ba9b80a661d6da4a9a967e77b1aa98cd5fcaa4e5078eb0f97431596b8f30cb9d27cc4256808d14c712a0fc5f2219594bc46f3551e7b1536cbc
+EBUILD aws-iam-tools-1.3.0.ebuild 1553 BLAKE2B b5a9214325f6ba6de22f9bfb774fdce73acdabf9a41bd6f27e06e4d967d3129820f855e35a3cacc82b49b13fcbd6142f97e8356f5ae6afbbdb15c5205de07925 SHA512 a437128c9f7dc8ff56e9cf4e0fd076aa2c8e596384581f8b8a11bf1c61369ebf1d7054a0c8cdd49522afa6037bc9129355875a2f79a9403e3edc41bc4cca1be7
 MISC metadata.xml 456 BLAKE2B 7c623b757f291e6ff28618f87a39f47dcbaa1b7dec75d642a98fc4930b3b75089af8d0ae14b14e9e422ed0ff12716ba337606a58fc1d678547ad16991669f103 SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8
diff --git a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
index e70c4d29a090..5714f191ff31 100644
--- a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
+++ b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
@@ -1,50 +1,50 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="The Command Line Interface for the AWS Identity and Access Management Service"
 HOMEPAGE="http://aws.amazon.com/developertools/AWS-Identity-and-Access-Management/4143"
 SRC_URI="mirror://sabayon/${CATEGORY}/IAMCli-${PV}.zip"
 
-S="${WORKDIR}/IAMCli-${PV}"
-
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/IAMCli-${PV}"
+S="${WORKDIR}/IAMCli-${PV}"
+
+src_prepare() {
+	default
 	find . -name '*.cmd' -delete || die
 }
 
 src_install() {
-	dodir /opt/${PN}
 	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
+	doins -r lib/.
+
 	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_IAM_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	doexe bin/*
+
+	cat > "${T}"/99${PN} <<- EOF || die
+		AWS_IAM_HOME=/opt/${PN}
+		PATH=/opt/${PN}/bin
+		ROOTPATH=/opt/${PN}/bin
+	EOF
 	doenvd "${T}"/99${PN}
 
-	dodoc "LICENSE.txt"
+	dodoc LICENSE.txt
 }
 
 pkg_postinst() {
 	ewarn "Remember to run: env-update && source /etc/profile if you plan"
 	ewarn "to use these tools in a shell before logging out (or restarting"
 	ewarn "your login manager)"
+
 	elog
 	elog "You need to put the following in your ~/.bashrc replacing the"
 	elog "values with the full path to your AWS credentials file."
diff --git a/app-admin/aws-rds-tools/Manifest b/app-admin/aws-rds-tools/Manifest
index dbb90a6876f7..3d620f122677 100644
--- a/app-admin/aws-rds-tools/Manifest
+++ b/app-admin/aws-rds-tools/Manifest
@@ -1,3 +1,3 @@
 DIST RDSCli-1.6.001.zip 6291974 BLAKE2B bdb7f9bce07e920b144cce15e6b05f9d98aeab4cbb33c181914d8584c5e24f70ef486e3d2b677e166ad9f936a2d15758ba55cc26f7fc129ed907989c2d3424a8 SHA512 29eb31064cc9b067bdc625e9777dd1cc77bdbd01a167c91c396d52f89fd9617496e2383fe343a17abb0d8029e47eb87f8ae7e60c0dd5a89cee485dbe45a05963
-EBUILD aws-rds-tools-1.6.001.ebuild 1567 BLAKE2B 3288bfa20d244192bcf1db5fc244be2329dbcd8852a5a1ae2feb1a829a016b9c19fbd91f855eece4410278634e2b5b3bdfb6bb0e1bf29f6ac125c7c3be2cede9 SHA512 f42e7bdb03c95d5833a3181369bc97dfca1ef2458bcd0faa124b8a33609852b8d52985361620dbe9bc3c20aa3441e652416799014cbe78cdbfe35506372449ad
+EBUILD aws-rds-tools-1.6.001.ebuild 1518 BLAKE2B e6d08e03f73f1e262b5adb5e43b6a8ac23c317c01b3aaa757dc6fd57fcc5d4d39d40bef4e9f4794708d3751f44ba22ab36aa864375ddf7b3a63890263a4e86cc SHA512 01ce630b9ca713f6b7495c3e12dfc03c97ec6ece0c9c6f216c1463bf0ce8ec3360032cf84ee5f04cce2d621297d14af8de88a808acf5f3073fb16b340306bddf
 MISC metadata.xml 456 BLAKE2B 7c623b757f291e6ff28618f87a39f47dcbaa1b7dec75d642a98fc4930b3b75089af8d0ae14b14e9e422ed0ff12716ba337606a58fc1d678547ad16991669f103 SHA512 aa4a57f4b0181ace33cad1698cdadd8cf41eb6f8fa8184ef415d09e0b0fbc81eaf579800c36040a9e01fb4fd2715e646a45d906d55e07617185ffe3f7b8538e8
diff --git a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
index 4d0cfb2e1d01..1cd6d1b4857c 100644
--- a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
+++ b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
@@ -1,50 +1,50 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="The Command Line Toolkit for the Amazon Relational Database Service"
 HOMEPAGE="http://aws.amazon.com/developertools/2928"
 SRC_URI="mirror://sabayon/${CATEGORY}/RDSCli-${PV}.zip"
 
-S="${WORKDIR}/RDSCli-${PV}"
-
 LICENSE="Amazon"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror"
+
 DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre"
-RESTRICT="mirror"
 
-src_unpack() {
-	unpack ${A}
-	cd "$S"
+S="${WORKDIR}/RDSCli-${PV}"
+
+src_prepare() {
+	default
 	find . -name '*.cmd' -delete || die
 }
 
 src_install() {
-	dodir /opt/${PN}
 	insinto /opt/${PN}/lib
-	doins -r "${S}"/lib/*
+	doins -r lib/.
+
 	exeinto /opt/${PN}/bin
-	doexe "${S}"/bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<EOF
-AWS_RDS_HOME=/opt/${PN}
-PATH=/opt/${PN}/bin
-ROOTPATH=/opt/${PN}/bin
-EOF
+	doexe bin/*
+
+	cat > "${T}"/99${PN} <<- EOF || die
+		AWS_RDS_HOME=/opt/${PN}
+		PATH=/opt/${PN}/bin
+		ROOTPATH=/opt/${PN}/bin
+	EOF
 	doenvd "${T}"/99${PN}
 
-	dodoc "THIRDPARTYLICENSE.TXT"
+	dodoc THIRDPARTYLICENSE.TXT
 }
 
 pkg_postinst() {
 	ewarn "Remember to run: env-update && source /etc/profile if you plan"
 	ewarn "to use these tools in a shell before logging out (or restarting"
 	ewarn "your login manager)"
+
 	elog
 	elog "You need to put the following in your ~/.bashrc replacing the"
 	elog "values with the full path to your AWS credentials file."
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 827407740a84..315e34708819 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -6,5 +6,5 @@ AUX conky-1.10.6-new_graph-oor.patch 1312 BLAKE2B 6afc8d2e72797155123d28081e7c8a
 DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
 DIST conky-1.10.6.tar.gz 365669 BLAKE2B 4f072b950083a1352904e9fbc2de016dbb3af93291e308ad2db799381f14880da4e32fa1da5ea1dab568bb782352c249d6200d581916ef3174e222f7a8294cc1 SHA512 ddd0b087e89654f8dace7d9682935a802b3bb22b7e65acd25dcc0f06e90b46bee695502d78b6e40a409f8eaffcd65a78d5f861ee6dbcbff6e48f88c2f20319c9
 EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
-EBUILD conky-1.10.6-r6.ebuild 5069 BLAKE2B 4cb18de49ac75fb0b4a783724086c53513fbe9b83221f21cc42b1727e438c818b27c7e2f0180365d50ec8858386a2af7aa4103504852989b2137c34d329d51b6 SHA512 20d3d03d30b45ac46d6b77482f3bd4ec03c077c4113361447f4b7191754363a62a89f96d874d12122190eb7b58ff95e33243f0c412d7377abd1de9b87f6ff8c9
+EBUILD conky-1.10.6-r6.ebuild 5075 BLAKE2B 2faac63d87f6c12e9077f2915b9d451b02b7f014de627d7a7881f837cfac9e3280bd1f0eb744437023c4247f3959ad87ec8cbc183736d68015d51842f298d492 SHA512 011b6142f50f1cd9addd30df888e7186ff370c6c5046091998af61e7aa1ddf8f7f18f1469c6f9ceb5795c803b26513cf01c0e8dfcd1637ab3a2ecc84ac37fa22
 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.6-r6.ebuild b/app-admin/conky/conky-1.10.6-r6.ebuild
index 214697b59d66..e72ff2d735ab 100644
--- a/app-admin/conky/conky-1.10.6-r6.ebuild
+++ b/app-admin/conky/conky-1.10.6-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
 IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
diff --git a/app-admin/cronolog/Manifest b/app-admin/cronolog/Manifest
index 89dafd11a403..f295cfda33bc 100644
--- a/app-admin/cronolog/Manifest
+++ b/app-admin/cronolog/Manifest
@@ -8,7 +8,5 @@ AUX 1.6.2-patches/cronolog-sigusr1.patch 1154 BLAKE2B a5506f1252a18eeb805c8703ba
 AUX 1.6.2-patches/cronolog-strftime.patch 435 BLAKE2B a4f817a743df2a1193609bb16e9d82ab932875bfe7e34c90af3289be8b01783ce7da9a8c8c9ee55d2db413e20efd264707de11b6669f5fd32445f8508a18aeda SHA512 8c226b70c7b026ce5e7400798d0e2016ed984df04bd66b6a2358ce445323be930b5f7951b879545c8f075761cc2b5062f9ccc4b759f2e586a4c8943efa4ee914
 AUX cronolog-1.6.2-umask.patch 2366 BLAKE2B 84134bf197929689edcb95605c89732175004771b8cbe0b7de84b7608444e1b37b447d3f37c5db3645c22d74a6e62d150a85cdb4d6487f92d32632d6646ef2ce SHA512 da3f7d84ce365edce396bc43ec9b469973301c6a28f3eb56b7f019dcb65fb7ceec981f92c1382542d01e4b6e49e32ff4fe283aed9dbc7bb30c6780775acf39b3
 DIST cronolog-1.6.2.tar.gz 133591 BLAKE2B 5a78d0136a834849c6f9fc9f41341808295fe38919ac795d5329c46f353b5fadebc5819031a07c2c2a780d54957d16edb9e8935e15a2ed77eb13a2d6c7d2832d SHA512 786135aaa1359605840effb9a755c500970098ca32c1c4976c62f9d7481d24cecefe223ce8dcc34a139427259a6f3ba1c435c700a72ee07ed68ffc7f2d36e4ea
-EBUILD cronolog-1.6.2-r3.ebuild 551 BLAKE2B 3a53e3eb62e1c8b4612e62ee9545e9c7b5016829c3e88ae9ea3250e34a2e54deb88334c6a74b422900428baff3bbf4d3c787e56ab5ea5230d4b43526357f6a3c SHA512 7d59570fa6a7346bc97acd36f9f30d4433929541bae8afe97ef7c2db2fa04bd2c11d63c750a41793edcbdf6d59456db890c48d07151d897cc5d160f7d5fa11d0
-EBUILD cronolog-1.6.2-r4.ebuild 636 BLAKE2B c8f1b0278cf994a3eaedfc7a833524da2fc2339513b34bc16d307dbb5edff56e1879976e521c7fb092237e74da323403d4438610d8ebb438c1e14fbe7d7fb135 SHA512 0b15fad256c0b3c2687aac00da048f3fb03ad35ecb307afa53c4f4d455f9c3930fc29a07f016151ea5296b6a1e0b74fb9e48de72d2f94f87e2a13d5e9cabb119
-EBUILD cronolog-1.6.2-r5.ebuild 610 BLAKE2B f4dd15b6046f4fcc95cbd5a164d934ca2ee3361975d84ecbc00f979302cff30ce9e9a50353d6a927ad90b9c4fea7692c95c67fd012345322d6ff98bed819a1f6 SHA512 c24343e2e09355cfe3b335583d13504a679a9f9cc2ffde0bb1fb2e30b86061b5d976bb5a275a48be2988f5b7a5667471f86a43a95bc457a1c86dadb716cdbd03
+EBUILD cronolog-1.6.2-r5.ebuild 539 BLAKE2B d1ce1f7f0e51a85ff4b36fcfbbe270a473d4a6b896e8cffc98e4ff5caf41e42dc3f621303cbab8d5859c2b7f20bc0de0ed83e07304dff2dcdc6c05138da54e3a SHA512 3fbac862e8f8410d5dc69c4efc134838f3070a8b255f655b681a303506ff1ea5d65b532ea12ef543dae1e1edc907e32d32c502c28000f2d29466997b05fc7618
 MISC metadata.xml 719 BLAKE2B aeabc972c2347a9a39d7073165aeebb1b307f81c52db0e294405e10cf903b4058a0d2fbab64cc4f81b1013c6b39fe1ceead0725b32ee9bfee1fa9e307499deee SHA512 d5b5452b8105d8273328ee8ab1c95674686a00862a578f8171c4799791ceb131ac0204693a3d65ce6136d9cbea114f7f899a85669bde9b76b8c8e800a4c4c75f
diff --git a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
deleted file mode 100644
index d3dd66369235..000000000000
--- a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils autotools
-
-DESCRIPTION="Cronolog apache logfile rotator"
-HOMEPAGE="http://cronolog.org/"
-SRC_URI="http://cronolog.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-1.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-patches/*.patch
-
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
deleted file mode 100644
index 3c603c959591..000000000000
--- a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils autotools
-
-DESCRIPTION="Cronolog apache logfile rotator"
-HOMEPAGE="http://cronolog.org/"
-SRC_URI="http://cronolog.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-patches/*.patch
-	# patch written for infra usage
-	epatch "${FILESDIR}"/${PN}-1.6.2-umask.patch
-
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
index ca4ce0c7003d..f8b32bd5968e 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Log rotation software"
 HOMEPAGE="https://github.com/fordmason/cronolog"
@@ -11,7 +11,7 @@ SRC_URI="http://cronolog.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-patches
@@ -19,10 +19,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-umask.patch
 )
 
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO )
-
 src_prepare() {
 	default
-	mv configure.in configure.ac || die
+	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/app-admin/diradm/Manifest b/app-admin/diradm/Manifest
index c22cb1faba94..8a28a9dfaea3 100644
--- a/app-admin/diradm/Manifest
+++ b/app-admin/diradm/Manifest
@@ -1,3 +1,3 @@
 DIST diradm-2.9.7.1.tar.bz2 126172 BLAKE2B 23f18a7946187caf1e12ec9d1f67a2c5c06895d837add3c79dd0b043d4745f0fd9b405e5667ebe5480946e4741c7bbff2be8c4281afcb7636353f72904f7e39b SHA512 5052f7b7072cd61eb9c70d23057f6c0d2fa68a151792d7260ca52716c9588c06234d335af84b967df23da4b4a8650502cab3b18900dc15e71f71b0888224993f
-EBUILD diradm-2.9.7.1.ebuild 2059 BLAKE2B b8c777f3131d280f344a19e5564e7c60e637949370ec59483d74b05d90c2ed0929a50f0ac148cb40f81b5b810f93416c7e305953fba9920aaf7a329e90d4795b SHA512 ba5875849b9297f0a07cae5a2511b5907763f2d6b9dc922224bfc4576d4f0dfbd151e7fc984f05460e1f36c0af91da46a27a11c4da2447620044eb448da2b287
+EBUILD diradm-2.9.7.1.ebuild 1707 BLAKE2B b006d5606650f6b1b11a165aa5f951d4593d6f2b479040b6d7955e731da352c6321c9b8bb654778742e9454df77e333a7413f3d8f1818b6bf369719bfd89ae6a SHA512 821bcdaaa0b0db69d658436e93ca400b57583b1081964ed199800c1b0ab04e9fc01052ae1ea0d038f6e0ee37f889db213b824fb5d1615e85cc770f09b190e147
 MISC metadata.xml 409 BLAKE2B 9228d543861d197474a3a1e7a698b4c14fa702cc1c7454b0ceb7fcbe3b6cccc5b4d3695efb917d0d65b6907c7447a93f63412a09496048dda0a716c65160a5a6 SHA512 e9324ac84f7909c5972a7bc60d81cccddf03509f2809387b9819c67d48dfaaf080377cd6d9c624f3315bf8548a3b764d077e42636d8f51695a1837a9ebb26fb2
diff --git a/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1.ebuild
index 40dd1892dcc6..2d6459346171 100644
--- a/app-admin/diradm/diradm-2.9.7.1.ebuild
+++ b/app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
 #HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
@@ -14,13 +12,15 @@ SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="samba irixpasswd automount test"
+IUSE="automount irixpasswd samba test"
+REQUIRED_USE="test? ( automount irixpasswd samba )"
+
 RDEPEND=">=net-nds/openldap-2.3
 	sys-apps/gawk
 	sys-apps/coreutils
 	sys-apps/grep
 	dev-lang/perl
-	app-shells/bash
+	app-shells/bash:*
 	sys-apps/sed
 	virtual/perl-MIME-Base64
 	samba? (
@@ -36,27 +36,24 @@ DEPEND="
 		net-nds/openldap[-minimal]
 	)"
 
-pkg_setup() {
-	use test && elog "Warning, for test usage, diradm is built with all optional features!"
+src_configure() {
+	econf \
+		$(use_enable automount) \
+		$(use_enable irixpasswd) \
+		$(use_enable samba)
 }
 
-src_configure() {
-	local myconf
-	if use test; then
-		myconf="--enable-samba --enable-automount --enable-irixpasswd"
-	else
-		myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
-	fi
-	econf ${myconf} || die "econf failed"
+src_test() {
+	emake -j1 check
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork \
-		THANKS TODO KNOWN-BUGS || die
+	default
+	dodoc CHANGES.prefork KNOWN-BUGS
+
 	if use irixpasswd; then
 		insinto /etc/openldap/schema
-		doins irixpassword.schema || die "Failed irixpassword.schema"
+		doins irixpassword.schema
 	fi
 }
 
@@ -69,7 +66,3 @@ pkg_postinst() {
 	elog "those packages, with a further fallback to /etc/openldap/ldap.conf"
 	elog "for server connection settings only."
 }
-
-src_test() {
-	emake -j1 check
-}
diff --git a/app-admin/fetchlog/Manifest b/app-admin/fetchlog/Manifest
index fcc1b58801ef..9e1c7b03b372 100644
--- a/app-admin/fetchlog/Manifest
+++ b/app-admin/fetchlog/Manifest
@@ -1,5 +1,4 @@
-DIST fetchlog-1.0.tar.gz 24016 BLAKE2B 0e9dd36767efa9e69741dead04cb6b48376c1f8393c12de286e4cd9510fc73685988a8a724ec80aeac8f36b52ce0f62581e85ba2ee049768c94988750f3a164f SHA512 66a7a456ebb5353171b2f53071a73cccd66d42dafc2740bafd7c9db860f68176dffe10e556fde52048f2b198c2eaf8299d1fd6094726f7a003987b5ce0be7415
+AUX fetchlog-1.4-fix-build-system.patch 631 BLAKE2B ebbc0d0e90c5183a2ac396ffc26356223b5b8072100a9a6dc2f7fd0c9c94287213f7f8f8749e3e54612f7c777848012f92fccfbb02295345d578dcbd974f3091 SHA512 480a30e040f56e3e1cf21172dc7f7f060fa81a8a0efb95e15a20b7762444b356547435f3eacc4cdb7a504f3049f6b05a7fab219f6cab9d3fe7901968a69c796e
 DIST fetchlog-1.4.tar.gz 32393 BLAKE2B 2741c536dfb17414ffaf90cebd9f8c7c1a1c80edb30bc726f15aa6acd610a07afb926c2566d27b30125e7f4733c1abde8eb81c68d81f609bc05328cf90755d44 SHA512 51590c0cdfa8f4a15fcb4a436375d960c25f35d84558ab46def58f83c97da30caee449eea7c62c539da786a613c2b1e51dbc223d70d56c21daad6e9faf8a51ad
-EBUILD fetchlog-1.0.ebuild 904 BLAKE2B c099c84db0b434197b6649070b2fc4ccef50900b82bcaf51ec20651608a6d5d907998cd99f0c0f01bbb715969f7b3f22a9c16e4496e3de599a21a5099253a83f SHA512 ce1a7d38d71c48fbc7a98ebad164701596fe32cbe8754c472ac37eff1448c89f8d73eaab5bcf9545b11019afee82780339e44575ed66d811b2aeb6d274ff114f
-EBUILD fetchlog-1.4-r1.ebuild 921 BLAKE2B c4770b88ef75759ea8236ad02ef8800c2291b502b00cdc242092eec75eb9562cd42d383c95221bf8090c6b4a1f3b85f3ffc5ab3d4038d088cb8144528f92b715 SHA512 fb740e43998b05e924e8f6818dfd4e2faba6c946a23bbf1300d1913cf11ab17e4c089622aa2f4dacdddcc6058c1b75aeb9708f2ead6105415bbd42c26e59693b
+EBUILD fetchlog-1.4-r1.ebuild 901 BLAKE2B b63c8dedb7800b1d792ebaeefc371c92f1e4c0149814087a34c1621d28a59d84422a2e53c2f2a4fcaa5d9d9eed4ab214a888527efeba25a39c5eacc82a4c78ea SHA512 5dc6ccac654048c675b1d72f4ace6ce832dd79c5fb445257c4f0176d27d5f6a34460a9e3d879d949cb479fc9bae232d68388459b632dadfa859b72f1671e87dd
 MISC metadata.xml 250 BLAKE2B a7de32c64d6f141fafdc392101c9c7ddeabb84d3c2f452662c96e27aa5e5f9d3ce47336bc707eb61396b02bee553a624a75195b7bc84949aabb5b660b1800dab SHA512 c4bde4a741bd01c371d3a4dec51ba522ad6ccb2fb95214e41f93366bedd37d7ca1729e638a5aee8e6af9e2280ce6c06c80e404428516e6a5c86264a629e87fe9
diff --git a/app-admin/fetchlog/fetchlog-1.0.ebuild b/app-admin/fetchlog/fetchlog-1.0.ebuild
deleted file mode 100644
index 85b9ef56513c..000000000000
--- a/app-admin/fetchlog/fetchlog-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Displays the last new messages of a logfile"
-HOMEPAGE="http://fetchlog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc64"
-
-IUSE="snmp"
-
-RDEPEND="snmp? (
-	>=dev-perl/Net-SNMP-4.0.1-r2
-	>=net-analyzer/net-snmp-5.0.6
-	)"
-
-pkg_preinst() {
-	elog
-	elog "This utility can be used together with Nagios"
-	elog "To make use of these features you need to"
-	elog "install net-analyzer/nagios."
-	elog "This feature depends on SNMP, so make use you"
-	elog "have 'snmp' in your USE flags"
-	elog
-}
-
-src_compile() {
-	# Links the .c file straight to the binary
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die
-}
-
-src_install() {
-	dodoc CHANGES README*
-	dobin fetchlog
-	doman fetchlog.1
-}
diff --git a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
index 0893accd6e63..c4313f546021 100644
--- a/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
+++ b/app-admin/fetchlog/fetchlog-1.4-r1.ebuild
@@ -8,16 +8,31 @@ inherit toolchain-funcs
 DESCRIPTION="Displays the last new messages of a logfile"
 HOMEPAGE="http://fetchlog.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fetchlog/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
-
+KEYWORDS="amd64 ppc x86 ~ppc64"
 IUSE="snmp"
 
-RDEPEND="snmp? (
-	>=dev-perl/Net-SNMP-4.0.1-r2
-	>=net-analyzer/net-snmp-5.0.6
+RDEPEND="
+	snmp? (
+		>=dev-perl/Net-SNMP-4.0.1-r2
+		>=net-analyzer/net-snmp-5.0.6
 	)"
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin fetchlog
+	einstalldocs
+	dodoc *cfg*
+	doman fetchlog.1
+}
 
 pkg_preinst() {
 	elog
@@ -28,15 +43,3 @@ pkg_preinst() {
 	elog "have 'snmp' in your USE flags"
 	elog
 }
-
-src_compile() {
-	# Links the .c file straight to the binary
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dodoc CHANGES README*
-	dodoc *cfg*
-	dobin fetchlog
-	doman fetchlog.1
-}
diff --git a/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch b/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch
new file mode 100644
index 000000000000..53c05d85f74c
--- /dev/null
+++ b/app-admin/fetchlog/files/fetchlog-1.4-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,8 @@
+ ### compiler
+ 
+ ### gcc
+-CC=gcc
+-CFLAGS= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \
++CC ?= gcc
++CFLAGS += -Wall -Wcast-qual -Wstrict-prototypes \
+ 	-Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align 
+ ### cc
+ #CC=cc
+@@ -72,7 +72,7 @@
+ 
+ # compiler stuff
+ # --------------
+-CC_OPT= $(CFLAGS) -DFETCHLOG_VERSION_NO=\"$(FETCHLOG_VERSION)\" \
++CPPFLAGS += -DFETCHLOG_VERSION_NO=\"$(FETCHLOG_VERSION)\" \
+ 	$(HAS_MADVISE) $(HAS_REGEX)
+ 
+ # all
+@@ -82,7 +82,6 @@
+ # fetchlog
+ # -------
+ fetchlog: fetchlog.c 
+-	$(CC) $(CC_OPT) fetchlog.c -o fetchlog
+ 
+ 
+ # install
diff --git a/app-admin/ide-smart/Manifest b/app-admin/ide-smart/Manifest
index 8eaf5c59c769..ead0b6dbe7ce 100644
--- a/app-admin/ide-smart/Manifest
+++ b/app-admin/ide-smart/Manifest
@@ -1,4 +1,5 @@
+AUX ide-smart-1.4-fix-build-system.patch 280 BLAKE2B feac0eeafdc202a7f0074c6ca8c102f5602bcd1b9ec734e605d122464c9e782db1efd502677d415b1620090a82b5ee70755e25bf478700eb6b89d059a9ba5bf4 SHA512 7b27a8842d0ac7834d660f1ef46563a210a37e737c469cfae0ec07d18ae6fa523b6482f8fcba3f63247742c86215e01a35294ea664a416e7ffa92184c91b8c03
 DIST ide-smart-1.4.tar.gz 19739 BLAKE2B d9c94b53855628ea10ea563f709754e7f79e50d43e24f76ac3c6dc9b5bdee81a547e63c4583c3506cc899c7e761b59dfbea6bb121f39053cefcac20a984b8d3b SHA512 9ac5cd03b67731aba5371ec9edb3aabb7d3e3b3680552b14741106d8d5ffe5a1705ad379dd8df60b972f3e23f66ed35b98341544feb4b856912138ccac109660
-EBUILD ide-smart-1.4-r1.ebuild 566 BLAKE2B b08856a5cbf6468e7cc2d5b494de43bb6ce0df62bafaddf9dc47ba3435b7b6a2846919c0cc44545702e7c4c3bd158ccdc15b6d3fe5dff144696b76a33463d192 SHA512 b87246febf9a05bf567b355cb46a5e30d25bd85c05caf3331c0489e213a4ddcc8225a1654920c5ce0fcc69558693589c3e4ed39c329a84f45213262f162bfab6
+EBUILD ide-smart-1.4-r1.ebuild 691 BLAKE2B 365faf918071ed12a596f8cf029c6b9fdb5e76dee3e6dc0c0ba11fadf868aa2ab7c8ed8af06aa25b559e6a65f71dbecd606b9e3065aca481d8db49bfd679285e SHA512 6a54fb402a507937358b6ada716caf88e9335dd02c83cee489bb2c2dd026521361a2df821a1bea13dbd025929d318036ec1648135dbbee703b7c9e9d07f13ae1
 EBUILD ide-smart-1.4-r2.ebuild 578 BLAKE2B 3e2a0f1117551cf82bb72af0f43f942ecf50aaaf624f772860f290cd708c5c6da12fb30c7a3eba05cbed211da60d7dbff94ede73a4e6b37c240e78425240e830 SHA512 73367fa4439efb9d52688da838416762119314f7545cde96973c1e14cb090d0497f4f8391bd9398cbbff0d8a15ad9fe409fb77fe341b4dae1fd568cb805571a8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/ide-smart/files/ide-smart-1.4-fix-build-system.patch b/app-admin/ide-smart/files/ide-smart-1.4-fix-build-system.patch
new file mode 100644
index 000000000000..ad523e36b3f9
--- /dev/null
+++ b/app-admin/ide-smart/files/ide-smart-1.4-fix-build-system.patch
@@ -0,0 +1,17 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,13 +2,10 @@
+ 
+ #CC      = gcc
+ PROF    = -g0 -O2
+-CFLAGS  = $(PROF) -Wall
+-LDFLAGS = $(PROF)
++CFLAGS += -Wall
+ TARGET  = ide-smart
+ OBJECTS = ide-smart.o
+ 		
+-ide-smart: $(OBJECTS)
+-	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJECTS)
+ 
+ all: ide-smart
+ 
diff --git a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
index cac5d77934f3..5ffb6e04cbb2 100644
--- a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="A tool to read SMART information from harddiscs"
@@ -12,12 +14,22 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-src_compile() {
-	$(tc-getCC) ${CFLAGS} -Wall ${LDFLAGS} -o ${PN} ${PN}.c || die "compile"
+PATCHES=( "${FILESDIR}"/${PN}-1.4-fix-build-system.patch )
+
+src_prepare() {
+	default
+
+	# yes, the tarball includes pre-compiled
+	# object files and binaries
+	rm ${PN}{,.o} || die
+}
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin ide-smart || die
+	dobin ide-smart
 	doman ide-smart.8
-	dodoc README
+	einstalldocs
 }
diff --git a/app-admin/integrit/Manifest b/app-admin/integrit/Manifest
index 3be0fb6a50ac..83a96c76cac2 100644
--- a/app-admin/integrit/Manifest
+++ b/app-admin/integrit/Manifest
@@ -1,5 +1,4 @@
-DIST integrit-4.0.tar.gz 266001 BLAKE2B ae0b5aaabeb593080d795b3b1d25af213bae9dc39a24c2ef6222c37919b81b39cf3b012bc4cb02fa9826bc6f68299919dd17253255c295481d64bd0bd71f031c SHA512 d05722285e850aea2a07baa8020a379e595f30cfe9d9142d437d6c15f41c5a687ada476971765cab9cf5972be8c4c76a6495c6fb09438d3b35584c8be5d5a4e5
+AUX integrit-4.1-fix-build-system.patch 1169 BLAKE2B 36b13162ea3a583968bda35ece1b4b1cc83871d4c2352ebcbffd079a9265d84b15e72d5e93f10e2404cd26e0622c666cb8b60e1cd53f207f0149a55814e10477 SHA512 4ed15ee8383e280b2d16d353f3401a058ad03c4ad84e4d0932ceec74391e04d266c2468270d2a08d299c57ee105f504c917fcf04b4ac07639bcba42e0fde84f6
 DIST integrit-4.1.tar.gz 271626 BLAKE2B 538a34c8e5c00e1be66ba35095be4d61402372ea7fd9ba9bfff9149c9a82c43d625ffb345fe84b7561100b31f2a2a1ba319e8b9a7d2b78e44a81d1ed6ae64f3a SHA512 599ae66a193fd87971994f59422e148e1ae01a5ff0fea93a0f2555c972f5254f0213116950766e72c87a57b1bd490f04afd3e0557d25a366c41dbbacc80b6842
-EBUILD integrit-4.0.ebuild 1329 BLAKE2B dd1a2626442104111202a774c27ab3eaf44cbbf450100a70615c643e7f9d0d103adb04f412e1d861e9c58f4b7cc6c70b6f01a3cddb627cae77e2d4e8fc007747 SHA512 690651f570ff866a944ee9bb5bd2641f03b43208872483cba4978bbffad0b4dcd80977d5152a5012920bb65a4ca9c8f3fd1f6bc860b7386494d70be92cc5e3ff
-EBUILD integrit-4.1-r1.ebuild 1311 BLAKE2B 49e69aa0e6e762c543ecd4ec6daaefa4613b9f6de6ba13cf6d25cf03c2cccf7e5f1a0989ab69452f365c468c134c72940aaced7c34767de95681f88904f79c3a SHA512 f8d8591e5c9288d2adcbf01e2ee68ce40d93d7fa1bd945d7a92d4c590a2a808f146601d131366c0eddf1acd8ac1979529aaaba1d319e12c31aad9a4e764a760f
+EBUILD integrit-4.1-r1.ebuild 1264 BLAKE2B 208f5ff74d53a189f7eabd131e3f032cff73d467e4622d317148d9a17c4b7db55335815ec6e59ba85794794bac1bff901dbd7d21b04e32ea0714fd3c7c54d5f1 SHA512 8cbb22064be0107ae5fa363185ccdecf347e7078a0d455d0af8af59b504282005816c1c52e3a01999568bb39a89e30043c48c556b6e78579c25dbc72afe8a5f4
 MISC metadata.xml 245 BLAKE2B 8edad0fa1051f1c6b28fa61e95cbde797389dcae4a23b953e0b77198a5557e068e09cdb6b2e32ca4e25ea07789c406529094d25fa74182656a4c59f4f7a42178 SHA512 e7052ee3572f1a5546b02087b7de95803a2e8b023aa24bc701eebb0bdd47b294d9634f4e78abfa10764e88397a067b1f1f8e431cddf5f8b260693f56ebd88b8b
diff --git a/app-admin/integrit/files/integrit-4.1-fix-build-system.patch b/app-admin/integrit/files/integrit-4.1-fix-build-system.patch
new file mode 100644
index 000000000000..64b3d47e59f8
--- /dev/null
+++ b/app-admin/integrit/files/integrit-4.1-fix-build-system.patch
@@ -0,0 +1,43 @@
+--- a/configure.in
++++ b/configure.in
+@@ -26,7 +26,6 @@
+ 
+ # ----- you can override these values by setting environment variables
+ # CC=my-compiler ./configure
+-CC=${CC:-"gcc"}
+ # CFLAGS="-g foo -x bar" ./configure
+ CFLAGS=${CFLAGS-"-g -Wall -O2"}
+ STATIC=${STATIC-"-static"}
+@@ -53,10 +52,9 @@
+ dnl AC_PROG_LEX
+ AC_PROG_MAKE_SET
+ AC_PROG_AWK
+-AC_PROGRAM_PATH(RM, rm , rm)
+ dnl syncing is the job of the O.S., and users can always do "make; sync"
+ dnl AC_PROGRAM_PATH(SYNC, sync, sync)
+-AC_PROGRAM_PATH(AR, ar, ar)
++AM_PROG_AR
+ AC_PROG_RANLIB
+ 
+ dnl ---------- let users override the install that configure finds
+--- a/hashtbl/configure.in
++++ b/hashtbl/configure.in
+@@ -25,17 +25,15 @@
+ 
+ # ----- you can override these values by setting environment variables
+ # CC=my-compiler ./configure
+-CC=${CC:-"gcc"}
+ # CFLAGS="-g foo -x bar" ./configure
+ CFLAGS=${CFLAGS:-"-g -Wall -O2"}
+ STATIC=${STATIC:-"-static"}
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+-AC_PROGRAM_PATH(RM, rm , rm)
+ dnl syncing is the job of the O.S., and users can always do "make; sync"
+ dnl AC_PROGRAM_PATH(SYNC, sync, sync)
+-AC_PROGRAM_PATH(AR, ar, ar)
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ 
diff --git a/app-admin/integrit/integrit-4.0.ebuild b/app-admin/integrit/integrit-4.0.ebuild
deleted file mode 100644
index f27b03a3238d..000000000000
--- a/app-admin/integrit/integrit-4.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="file integrity verification program"
-HOMEPAGE="http://integrit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
-	sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
-
-	eautoreconf
-}
-
-src_compile() {
-	tc-export AR
-	econf
-	emake || die
-	emake utils || die
-	cd "${S}"/doc
-	emake || die
-	cd "${S}"/hashtbl
-	emake hashtest || die
-	mv README README.hashtbl
-}
-
-src_install() {
-	dosbin integrit || die
-	dolib libintegrit.a
-	dodoc Changes HACKING README todo.txt
-
-	cd "${S}"/utils
-	dosbin i-viewdb
-	dobin i-ls
-
-	cd "${S}"/hashtbl
-	dolib libhashtbl.a
-	insinto /usr/include
-	doins hashtbl.h
-	dobin hashtest
-	dodoc README.hashtbl
-
-	cd "${S}"/doc
-	doman i-ls.1 i-viewdb.1 integrit.1
-	doinfo integrit.info
-
-	cd "${S}"/examples
-	docinto examples
-	dodoc *
-}
-
-pkg_postinst() {
-	elog "It is recommended that the integrit binary is copied to a secure"
-	elog "location and re-copied at runtime or run from a secure medium."
-	elog "You should also create a configuration file (see examples)."
-}
diff --git a/app-admin/integrit/integrit-4.1-r1.ebuild b/app-admin/integrit/integrit-4.1-r1.ebuild
index d987937dc338..bac0fe23c099 100644
--- a/app-admin/integrit/integrit-4.1-r1.ebuild
+++ b/app-admin/integrit/integrit-4.1-r1.ebuild
@@ -1,61 +1,61 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="file integrity verification program"
 HOMEPAGE="http://integrit.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}"/${PN}-4.1-fix-build-system.patch )
+
 src_prepare() {
-	sed -i -e "/^CC/d" configure.in hashtbl/configure.in || die
-	sed -i -e "/^AC_PROGRAM_PATH/d" configure.in hashtbl/configure.in || die
+	default
+	mv configure.{in,ac} || die
+	mv hashtbl/configure.{in,ac} || die
+
+	# tests are not executable
+	chmod +x test/test || die
+
 	eautoreconf
-	tc-export AR
 }
 
 src_compile() {
 	emake
 	emake utils
 
-	cd "${S}"/doc && emake
-	cd "${S}"/hashtbl && emake hashtest
-}
-
-src_test() {
-	chmod +x test/test || die
-	default
+	emake -C doc
+	emake -C hashtbl hashtest
 }
 
 src_install() {
 	dosbin integrit
-	dolib libintegrit.a
+	dolib.a libintegrit.a
 	dodoc Changes HACKING README todo.txt
 
-	cd "${S}"/utils
-	dosbin i-viewdb
-	dobin i-ls
+	# utils
+	dosbin utils/i-viewdb
+	dobin utils/i-ls
 
-	cd "${S}"/hashtbl
-	dolib libhashtbl.a
-	insinto /usr/include
-	doins hashtbl.h
-	dobin hashtest
-	newdoc README README.hashtbl
+	# hashtbl
+	dolib.a hashtbl/libhashtbl.a
+	doheader hashtbl/hashtbl.h
+	dobin hashtbl/hashtest
+	newdoc hashtbl/README README.hashtbl
 
-	cd "${S}"/doc
-	doman i-ls.1 i-viewdb.1 integrit.1
-	doinfo integrit.info
+	# doc
+	doman doc/{i-ls.1,i-viewdb.1,integrit.1}
+	doinfo doc/integrit.info
 
-	cd "${S}"/examples
-	docinto examples
-	dodoc *
+	# examples
+	dodoc -r examples
 }
 
 pkg_postinst() {
diff --git a/app-admin/longrun/Manifest b/app-admin/longrun/Manifest
index 4eb6e728b1c9..016068bc56a5 100644
--- a/app-admin/longrun/Manifest
+++ b/app-admin/longrun/Manifest
@@ -1,6 +1,6 @@
-AUX 0.9-makefile_cflags.patch 577 BLAKE2B 65c3109ca5b6e89fa9000fd7321a456db18e7cf667273574eaf4fd69b153f280d3eb6eceb92bb8fb5b0a580b7448a4f858ae4c29a0aaeadfa7d0daed674c1c17 SHA512 a461d9fc0b1a0d7aa2f36c02d5121b2a8e433b7254f08e53a6a8b8a7cc0ad25bb707a80b6d07148543b74aa78696868583e1004a64c631694eef85c787cdd051
+AUX 0.9-makefile_cflags.patch 305 BLAKE2B 7b2c0df4162b44c723286b86f1cdff3de6761def2139d737c3dc7ac754b6e8b9f5674528a12334316fbc922f4b9d961d2e53e0e7c085f69a16952395feaef36e SHA512 3aaf8b9a21364264734de21505a5c2e5327bc443a25e26db55af87b49bec6b9a767bce9abdcf24ee0af2e43579460a36caaffa1d6d57b7420192685194f4979d
 AUX 0.9-replace-loff_t.patch 992 BLAKE2B 81c94054ba9ab75cd6c9f71e10c78b6f921695e9b0273aa35a394bade52d1183e588a3a5c8b894c1c16cf5c3c620f1777ab56e591fdb68ed6e70927c4aa89f2c SHA512 6eb0e828afcd6265babd4cefd50191610095c8d6309b75089ecf3f34363231bf8a2b68c3db0d3938904951035232b9bafcb2029de832e9c7515922dad3ceac1b
 DIST longrun-0.9.tar.bz2 11539 BLAKE2B a308dc7f350399da0bf593e2eee8109a90103b298d943976f0da143c52105362aa100763dcdd3cacd4c3244cdd5a7eb9a1b355aa803a69a2225ea18c6e5a60dd SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055
 DIST longrun_0.9-19.diff.gz 14697 BLAKE2B 98a7497679df5be0346a37b6119a9418c7fba80672eb2c345784628c3517c6f1fbc8d953abe2696a3b576310cd489e5c1d3595153bbfa9d82dfb44697c246116 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35
-EBUILD longrun-0.9-r4.ebuild 1892 BLAKE2B 873fab60e84aa633070dcb1b989baf8c50f7ab0668b1f7797a203042f16a88957d0a7ad2dbbcae745461f3f34a230a1ebd2818d0351fcc716e16c2c762e07c35 SHA512 31eb732fc24e9753b50bee89048126ca6b644889ad875fc72e87d91be8897ce6385bea2836f353902656f2430c71ece3e909a15031279bb06949e72efca69275
-MISC metadata.xml 430 BLAKE2B 811da21cd5535cd1e0bc5eccf5e9d528719be696beac8fcf58ce4a7f468c45a5d58c802f02d5b1502c7f7fa6389701c112148cf987bbfb4518b0b1a8b92cdf6b SHA512 5cdee63c75352e195e930b08f01a3829529ab59267e3e3df63ed48aae7d2b8097279df91c07ff871d5c6934afc182626df2c994366a9fa88cd72b9309426b677
+EBUILD longrun-0.9-r4.ebuild 1766 BLAKE2B 6e0cece68b00d87f1d8d96059aea5f964c3215d90a48493f88358374ce09bc1798e53e4df6a9e613d918f790ffb26be3cb718ecf8550ac39de2a141f11a321e8 SHA512 447e4e55c29db55c4b105681a485e682bc7158f1a1caf4b7e3b95a572014a893ead7170290ec50b95d6fc5eda42de2ee6d81ccb501e97e532956dc368f05ff4d
+MISC metadata.xml 437 BLAKE2B 932878fe62012a5285dfc19f3e2a2d8a3f0eff2809dca919e58b81e2c82e256c1cf7fd4a8b477919973ed76ec0481ec00f25de43b78f054ae6f016948f5969d0 SHA512 1962bfa09950f194062baddd9996a84ba6264c1ed76e4e93d376a9935500a35377ea36c24fc55668d59f8488b9d3cdfe56139b91cc179d52e184f7f164d23ab9
diff --git a/app-admin/longrun/files/0.9-makefile_cflags.patch b/app-admin/longrun/files/0.9-makefile_cflags.patch
index a15229177881..8848dc667866 100644
--- a/app-admin/longrun/files/0.9-makefile_cflags.patch
+++ b/app-admin/longrun/files/0.9-makefile_cflags.patch
@@ -1,14 +1,13 @@
-Common subdirectories: longrun.old/debian and longrun/debian
-diff -u longrun.old/Makefile longrun/Makefile
---- longrun.old/Makefile	2005-08-12 22:36:14.186390784 +0300
-+++ longrun/Makefile	2005-08-12 22:37:36.157929216 +0300
-@@ -3,7 +3,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,8 +2,8 @@
+ 
  all: longrun README stamp-po
  
- longrun: longrun.c
+-longrun: longrun.c
 -	gcc -DLOCALEDIR=\"$(LOCALEDIR)\" -g -O2 -W -Wall -o longrun longrun.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" -W -Wall -o longrun longrun.c
++CFLAGS += -W -Wall
++CPPFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
  
  README: longrun.1
  	groff -Tascii -man longrun.1 | col -bx > README
-Common subdirectories: longrun.old/po and longrun/po
diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild
index afe681e3a693..0508c52ea188 100644
--- a/app-admin/longrun/longrun-0.9-r4.ebuild
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@@ -1,54 +1,50 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils linux-info toolchain-funcs
+EAPI=6
+
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="A utility to control Transmeta's Crusoe and Efficeon processors"
 HOMEPAGE="http://freshmeat.net/projects/longrun/"
 
 DEBIAN_PATCH_VERSION="19"
-DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff.gz"
+DEBIAN_PATCH="${PN}_${PV}-${DEBIAN_PATCH_VERSION}.diff"
 SRC_URI="
 	mirror://kernel/linux/utils/cpu/crusoe/${P}.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}"
+	mirror://debian/pool/main/l/${PN}/${DEBIAN_PATCH}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-ppc x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="sys-apps/groff"
 
 S=${WORKDIR}/${PN}
 
 CONFIG_CHECK="~X86_MSR ~X86_CPUID"
-
 ERROR_X86_MSR="
 Longrun needs a MSR device to function. Please select
 MSR under Processor type and features. It can be build
-directly into the kernel or as a module.
-"
-
+directly into the kernel or as a module."
 ERROR_X86_CPUID="
 Longrun needs a CPUID device to function. Please select
 CPUID under Processor type and features. It can be
-build directly into the kernel or as a module.
-"
+build directly into the kernel or as a module."
 
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd "${S}"
-	epatch "${DISTDIR}/${DEBIAN_PATCH}"
-	epatch "${FILESDIR}/${PV}-makefile_cflags.patch"
-	epatch "${FILESDIR}/${PV}-replace-loff_t.patch"
-}
+PATCHES=(
+	"${WORKDIR}"/${DEBIAN_PATCH}
+	"${FILESDIR}"/${PV}-makefile_cflags.patch
+	"${FILESDIR}"/${PV}-replace-loff_t.patch
+)
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	default
 	dodoc MAKEDEV-cpuid-msr
 }
 
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index 36cfa75cbc14..fcfeedac0c13 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-Longrun is a user space utility program for controlling the Longrun
-thermal and power save functionalities found in the processors made
-by Transmeta.
-</longdescription>
+		Longrun is a user space utility program for controlling the Longrun
+		thermal and power save functionalities found in the processors made
+		by Transmeta.
+	</longdescription>
 	<upstream>
 		<remote-id type="freshmeat">longrun</remote-id>
 	</upstream>
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
index bcc970957a2b..fa2fcf681d91 100644
--- a/app-admin/makepasswd/Manifest
+++ b/app-admin/makepasswd/Manifest
@@ -1,3 +1,3 @@
 DIST makepasswd_1.10.orig.tar.gz 12382 BLAKE2B f38e181da077650af760123e86cdbc2f39259db82d06198280ac37f5391a7de00ca7009a69b491a150ec9e542c25b7538141941819ef540714e2a6cd75ddd4c2 SHA512 215b8c3941f395c02be43044aed972425db8fe8472ec9f4f39f7f574d9f36c5a1af5bba495dd10570363e923bfe42c26d7571741ae2ef350e660c9973ac0a5ac
-EBUILD makepasswd-1.10.ebuild 559 BLAKE2B 35ff0f2be6b1e16256e58cd3956959b9a0ae7ab22139767dfbc7a3e7c196a23e35fdbf0a9ad81816f9606aaeb3a2591792a8d4e3a60f06deb0379a23af79c938 SHA512 c03e089c4c6840f86d20ad625eb965f429c08050805691c9ad73b93cc774150f568a9aedc312c63e0ffb9b6f434ade35c7090845cc3f00df056d8833e828213c
-MISC metadata.xml 359 BLAKE2B 32965b4e7cc42884b5b6dd59894ebd809e1ac012fea2be0c2adca3f1f29fcc82c36e4afdf6788eca2eb1ff3568d0439db808d48b7ce36f51547c51d7f704fde9 SHA512 35b42b251968ad982920a16df9575110cbd74d46ef39fc62e3212525aa1c291effd399ea870ecf0caa722c9d556aaa7211509550db2867f90b9008ee856092c1
+EBUILD makepasswd-1.10.ebuild 553 BLAKE2B 66f890ab98431b7c34119b72691d8be66a145a91f6f45382348bc5e646fa50872659e9df640bb7d9ce8cb53d240df21f607f3d06552a26b8248c510ed091212e SHA512 fd9ed23da2b80d71fd483076e6646f84f7522fe694529fe8af5148f29e5baff3bda4f1cc56d37423350a6150b2406b32da23f2b1601ac844465e660ec25cd488
+MISC metadata.xml 359 BLAKE2B fa76c590cdc7361bf05ff444616592b7da08379af98d0296aec906efa6a985b573aa738ef8bd8d0f33ff09aa9aa96008e31e1d0fd8d1d9ad52605e2adca71634 SHA512 e0770ad04371f82e5d005229b1c5f04a3d4e6343c380ea230d4f0bfaf8306aa04fc11fac75149da0f80410f72771c840fa4f8ecea1a40ec6273fdeb829207c71
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index 55a550379ba0..6b03b64a3aa2 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Random password generator"
-HOMEPAGE="http://packages.debian.org/stable/admin/makepasswd"
+HOMEPAGE="https://packages.debian.org/stable/admin/makepasswd"
 SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
@@ -13,7 +15,7 @@ IUSE=""
 RDEPEND="dev-lang/perl"
 
 src_install() {
-	dobin makepasswd || die
+	dobin makepasswd
 	doman makepasswd.1
-	dodoc README CHANGES
+	einstalldocs
 }
diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
index 48fe1ac76d44..00668f1a86d9 100644
--- a/app-admin/makepasswd/metadata.xml
+++ b/app-admin/makepasswd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<longdescription lang="en">
-		A random password generator, for all your secure password needs.
-	</longdescription>
 	<maintainer type="person">
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<longdescription lang="en">
+		A random password generator, for all your secure password needs.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/qpage/Manifest b/app-admin/qpage/Manifest
index 052f26ef723f..3472383cfa14 100644
--- a/app-admin/qpage/Manifest
+++ b/app-admin/qpage/Manifest
@@ -1,6 +1,7 @@
 AUX qpage 568 BLAKE2B a1e0e53332af86dd63339e3c8353f8e4c454ebe38ad9df0d3a9c141bca7db8fbfbb8773f58e8ae97efdbd9d6a56a1fda896d64f8d633de4fe9a81e3ff1f6cbfd SHA512 3153cab39730cf1173a1cdb3fa61dead6f767650427b03e7f69173969272eda683fb9aee79b69b1bb879f3c6a30266d6842ceb7f438c09806e35886d923832b4
+AUX qpage-3.3-fix-build-system.patch 603 BLAKE2B e6bde35536561397c6aba4cc7e5f2523beb74e59732ddbe6f8c5672bcefaf4781494d37b7aaecbbe3a81239093c0b0f58034577378313e1ccaaeb21da092b4c4 SHA512 efd9ef6ea9c9df9ce52c53cd962b55170a49a0e8cdeb82aca05e8cb70c79b8afc930b9678f718305fe28e4ef9b359c1d6bffb09f3a23758b1328d0a393a6516a
 AUX qpage-3.3-fix-warning.patch 450 BLAKE2B 4947c7b7aa7bcb05f63f371a1a06211fd63582af4d492b8541828bd124ac71a458266e49fad21da34efc854d34ca5a3395d4b76bbac6a17f1678f43f9afd3b00 SHA512 c2b0ad552ff60471171693eca90e51470072c73961bf30406e59c7929f02f093d754d5f1e278a43e0aac8d1031dafcbd085b0b59a1d9634f6f631c2a84e7a7c1
-AUX qpage-3.3-gentoo.patch 1764 BLAKE2B ef43620f0e8172ca6bb967732f8d8ce0cb73d48ea6c4a2741a18527c4a2f6ca78f4fe51a470474a6138e1fddc8b136e6b9f806f8f43c2d30cf27c6e15d34a3a8 SHA512 5bdcab57907871dabd1b4beca928fe30bad1729a5185c5885f6c3252b0e3a5394fe0bf5d4f206438d9d83a608669d0a73bb9dea7c9b94c48dbef77e4331e60a8
+AUX qpage-3.3-gentoo.patch 1472 BLAKE2B 804be08ec654aab34d338cf1d3d1f69d7d2984b8b931e06d5117e449e19a6ee80cb1bedc71dffe070e2e44326881702b0aea2fd4fc2f67130c315a2fe3101294 SHA512 a9e0a1793a8af41340c5593420eecf54fdc405600f71704efd3cdb9f70d9bdfacdff636cea5839c5ca024be27f90c84a7a2c1c95e078af2fffdd7cbc6ae7e5f4
 DIST qpage-3.3.tar.Z 225689 BLAKE2B 25ac50bbe1e5a623a95f0ca8ad53255693647ca49763d80bb571ce36cf941618b6cbecc1681035d5d56d559a30e2da2a8d3621588925b00b9cac7ad278ec4a44 SHA512 d6062fb9e9cd6cfd60cadb923d29d36fd649c27adff2a36fd4e768798b90780153b78e7d0d1a13dcad94971ac98b32c1c5a3b415d5a1b4aa1cfbac564514a3e9
-EBUILD qpage-3.3.ebuild 1674 BLAKE2B 9070962506a93a0326697effafa869d6cfcb56609e1b3fb3e74f2d097d092061f6f5ece46788cff8402a4bc639eb4fed1411ef6ce89c83c16d0806aba26c4f8f SHA512 b83c8a54ec808a662a52d530ce9e64a81196ace477476f689591eacaff7a4dcbf5eed98081d05045b0b796fca32d2bc06f5cb7c53aff6c32d48344b75ed1e598
-MISC metadata.xml 620 BLAKE2B 86d1b4ba97f1456d38b9e755efd17a9fd22d20331de1780c8425430f0a908b3c75d617e59d4a2a0e8812e91ab06c57f3c232d0fdc810229d017faa7bc9d4a16b SHA512 4310087f97f28aa193b9bb365612f32f6c3bd995446ce077bd099d662d1c0deda1b17418e4e2c0d89f3d53e9badd7c5aef946218fad43db1a273c7f67f444ca1
+EBUILD qpage-3.3.ebuild 1581 BLAKE2B ec7511f5b27714f621f308872514bff98f014bc9eda7d2244b88efa223a73a0ac25a60d5e15182aa51ca8cfdce9f61522be7ae5bcea1baf0b7f1edbd4b8652f7 SHA512 3733207dbaa4e98861bffe500ac69dc366c76f3662a59ee7ef78090d08533a311ba268605a32b882e0013093bf8540933abf89732a51f2cf40333cf97ed8615e
+MISC metadata.xml 636 BLAKE2B 35f51043f98eb59d371ec414588cc51f056522bcf8fd02a516c7f523cff009f55fb162a964516a35e7cccd8c942ea3545b42d623764d467d5465913a8b047859 SHA512 9d45fd5a3361b6ffc1548df05595df91726d0037043c0443601b7bd1588218adccfecb38de8ae961a6e1ff5e618b14dc1e249f94657ec98fab914f1a70f13dad
diff --git a/app-admin/qpage/files/qpage-3.3-fix-build-system.patch b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch
new file mode 100644
index 000000000000..0fd091df8e0e
--- /dev/null
+++ b/app-admin/qpage/files/qpage-3.3-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -65,12 +65,12 @@
+ 		@exit 1
+ 
+ install:	all
+-		$(RM) $(bindir)/$(PROG)
+-		$(MKDIR) -p $(bindir)
+-		$(CP) $(PROG) $(bindir)
+-		$(RM) $(mandir)/man1/$(PROG).1
+-		$(MKDIR) -p $(mandir)/man1
+-		$(CP) $(PROG).man $(mandir)/man1/$(PROG).1
++		$(RM) $(DESTDIR)$(bindir)/$(PROG)
++		$(MKDIR) -p $(DESTDIR)$(bindir)
++		$(CP) $(PROG) $(DESTDIR)$(bindir)
++		$(RM) $(DESTDIR)$(mandir)/man1/$(PROG).1
++		$(MKDIR) -p $(DESTDIR)$(mandir)/man1
++		$(CP) $(PROG).man $(DESTDIR)$(mandir)/man1/$(PROG).1
+ 
+ #		$(INSTALL) S99qpage /etc/rc3.d
+ #		ln /etc/rc3.d/S99qpage /etc/init.d/qpage
diff --git a/app-admin/qpage/files/qpage-3.3-gentoo.patch b/app-admin/qpage/files/qpage-3.3-gentoo.patch
index 577fb8a4ff3b..72baf899764e 100644
--- a/app-admin/qpage/files/qpage-3.3-gentoo.patch
+++ b/app-admin/qpage/files/qpage-3.3-gentoo.patch
@@ -1,5 +1,5 @@
---- config.input.dist	2003-04-11 14:03:36.000000000 -0700
-+++ config.input	2003-04-11 14:05:47.000000000 -0700
+--- a/config.input
++++ b/config.input
 @@ -20,7 +20,7 @@
  # See the QuickPage documentation for complete details about
  # the syntax of the configuration file.
@@ -18,8 +18,8 @@
  
  
  #
---- qpage.man.dist	2003-04-18 14:43:45.000000000 -0700
-+++ qpage.man	2003-04-18 14:43:55.000000000 -0700
+--- a/qpage.man
++++ b/qpage.man
 @@ -867,7 +867,7 @@
  must be able to detect when it's safe to send dial commands to the modem.
  .LP
@@ -29,8 +29,8 @@
  .SH SEE ALSO
  .B RFC-1861
  .SH KNOWN BUGS
---- example.cf.dist	2003-04-25 09:55:47.000000000 -0700
-+++ example.cf	2003-04-25 10:55:11.000000000 -0700
+--- a/example.cf
++++ b/example.cf
 @@ -21,7 +21,7 @@
  #
  #	modem=<modem name>
@@ -59,8 +59,8 @@
  	baudrate=1200
  	parity=even
  	allowpid=yes
---- ixo.c.dist	2003-04-25 11:36:30.000000000 -0700
-+++ ixo.c	2003-04-25 11:37:37.000000000 -0700
+--- a/ixo.c
++++ b/ixo.c
 @@ -192,7 +192,7 @@
  		if ((i = read_modem(fd, seconds)) < 0)
  			return(NULL);
diff --git a/app-admin/qpage/metadata.xml b/app-admin/qpage/metadata.xml
index f61b7216e28c..6ab99be94028 100644
--- a/app-admin/qpage/metadata.xml
+++ b/app-admin/qpage/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>chutzpah@gentoo.org</email>
-	<name>Patrick McLean</name>
-</maintainer>
-<longdescription lang="en">
-QuickPage is a client/server software package that enables you to send messages
-to an alphanumeric pager. The client accepts a message from the user and
-forwards it to a server using SNPP. The server uses a modem to transmit the
-message to the recipient's paging service using the TAP protocol (also known as
-the IXO protocol).
-</longdescription>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		QuickPage is a client/server software package that enables you to send messages
+		to an alphanumeric pager. The client accepts a message from the user and
+		forwards it to a server using SNPP. The server uses a modem to transmit the
+		message to the recipient's paging service using the TAP protocol (also known as
+		the IXO protocol).
+	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild
index 01cddbc87320..9231daae0add 100644
--- a/app-admin/qpage/qpage-3.3.ebuild
+++ b/app-admin/qpage/qpage-3.3.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Sends messages to an alphanumeric pager via TAP protocol"
 HOMEPAGE="http://www.qpage.org/"
@@ -16,30 +18,26 @@ DEPEND="tcpd? ( sys-apps/tcp-wrappers )"
 RDEPEND="${DEPEND}
 	virtual/mta"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-fix-warning.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-fix-warning.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	econf || die "econf failed"
+	default
 
 	# There doesn't seem to be a clean way to disable tcp wrappers in
 	# this package if you have it installed, but don't want to use it.
 	if ! use tcpd ; then
-		sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile
-		echo '#undef TCP_WRAPPERS' >> config.h
+		sed -i 's/-lwrap//g; s/-DTCP_WRAPPERS//g' Makefile || die
+		echo '#undef TCP_WRAPPERS' >> config.h || die
 	fi
-
-	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	default
 
 	dodir /var/spool/qpage
 	fowners daemon:daemon /var/spool/qpage
@@ -50,7 +48,7 @@ src_install() {
 	fperms 770 /var/lock/subsys/qpage
 
 	insinto /etc/qpage
-	doins example.cf || die "doins example.cf failed"
+	doins example.cf
 
 	doinitd "${FILESDIR}"/qpage
 }
diff --git a/app-admin/quickswitch/Manifest b/app-admin/quickswitch/Manifest
index 1dfa24c38d9f..e350ec648feb 100644
--- a/app-admin/quickswitch/Manifest
+++ b/app-admin/quickswitch/Manifest
@@ -1,3 +1,4 @@
+AUX quickswitch-1.05-fix-paths.patch 1924 BLAKE2B b10ea8e626248963b8acfbbd0631f7cbde6cbd6c05d429c9a28ac163389809c1d211dd9f4bdf614d3f0ca5f50779152a7737a83cbb33eb7f51f96052ba4b4c1b SHA512 1df3e97dc223be657efa17637b7bfb541b3fb116856662d06c4be97bffadfc43e8b6242791b6918ff3b7cbc02ce5e01008efc2856269ff0ed1e40216bd33d13c
 DIST quickswitch-1.05.tar.gz 20218 BLAKE2B 9a17132e07c838dd0d39eb887502ee70fd35206d38d795e5f49307eafa756cbf78b7ffdb0c7de19197560adedff902f09bf52a4c7db9359185ecc37f42abb6c7 SHA512 dfb6b952e06d03834b22ad1abe415499bc3f231dcfee0b551ceadc4c020604b2574b70fff03ffb7099913d77e49c545ee44d51f9f7651c4fba113b0503c3bd26
-EBUILD quickswitch-1.05.ebuild 1055 BLAKE2B 44464cb3bd48ea8bcdd75f422f876e1a1aea4a5e850a16a24539260cc801268207d35161fd24e13fbc770b23643c7a88b36476cd70e905d2d594b979c703fdc6 SHA512 b4e92d4b4f036148e8374e364e13b666d308a27c7146ed574b6859ab3eef103f0d615960e07390a7535ef22eacabbc93eae753bf6c865c09417a6f8cbd0fbde4
+EBUILD quickswitch-1.05.ebuild 628 BLAKE2B bf33cf3a209b8ad8531326c8f08497d32f0c54d619d019f1d447663a430617b40fe69eee64b7c3484b0e6b537cb52852bb567bd93cc3085bdcf2713b6bac7980 SHA512 874076e10e7dd9c94d4e96bddb0b30663f14be113c0e40db0b8ac4b1f871ba90fbedca03868a69e861b0da9381d703379ff8ad9913d5ccf659b8527d0585da78
 MISC metadata.xml 377 BLAKE2B c17495cc30293086a7a85a9a278ed134e4e7d47169e8ffb1e6d94dcd2f3f81372aa90e5e628ab322e1d3d9bb98af194445764399573231e604e3b51562d359f2 SHA512 05f90b3b4a18647e32f7c3f3029822fefb7aef4cbdbd2f6e74a8f2799e5a42f7f5546307c792aa4bf366536b4d7c1eeef6b4cc1a6b4d6f84d0ac16e5e77a8c88
diff --git a/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch b/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch
new file mode 100644
index 000000000000..707a355c09f9
--- /dev/null
+++ b/app-admin/quickswitch/files/quickswitch-1.05-fix-paths.patch
@@ -0,0 +1,62 @@
+--- a/switcher
++++ b/switcher
+@@ -67,7 +67,7 @@
+ 
+ ### load quickswitch package
+ $_SWITCHTO = '/usr/bin/switchto'; # default location
+-$CONF_FILE = '/etc/switchto.conf';
++$CONF_FILE = '/etc/quickswitch/switchto.conf';
+ $SWITCHTO = find_switchto($CONF_FILE);
+ $ENV{RUNNING_FROM_SWITCHER} = 1;
+ require $SWITCHTO;
+--- a/switchto
++++ b/switchto
+@@ -26,7 +26,7 @@
+ #
+ # Send bug-reports, comments, women to bugs@muthanna.com
+ #
+-# Also see /etc/switchto.conf for further docs.
++# Also see /etc/quickswitch/switchto.conf for further docs.
+ #
+ # Release: 0.16
+ #
+@@ -143,8 +143,8 @@
+ $AUTHOR    = "Mohit Muthanna, Paul Seamons";
+ $DATE      = '2002';
+ 
+-### I would suggest renaming this /etc/switchto.conf
+-$CONF_FILE = "/etc/switchto.conf";
++### I would suggest renaming this /etc/quickswitch/switchto.conf
++$CONF_FILE = "/etc/quickswitch/switchto.conf";
+ %DEFAULTS  = (
+               autoconfig      => 0,
+               device          => "eth0",
+@@ -165,7 +165,7 @@
+               nfsexportall    => "/usr/sbin/exportfs -a",
+               nfsexportsfile  => "/etc/exports",
+               niscommand      => "/bin/nisdomainname",
+-              servicefilename => "/etc/switchto.last",
++              servicefilename => "/etc/quickswitch/switchto.last",
+               execpre         => undef,
+               execpost        => undef,
+ 
+--- a/switchto.conf
++++ b/switchto.conf
+@@ -43,7 +43,7 @@
+ device=eth0
+ 
+ # Path to save last good known configuration...
+-servicefilename=/etc/switchto.last
++servicefilename=/etc/quickswitch/switchto.last
+ 
+ # Path and arguments to switchto. This is for the switcher GUI
+ # switchtopath=/usr/bin/switchto -b
+@@ -52,7 +52,7 @@
+ # Uncomment theses and change them if needed.
+ # ------------------------------------------
+ # ifconfig=/sbin/ifconfig
+-# iwconfig=/usr/local/sbin/iwconfig
++# iwconfig=/sbin/iwconfig
+ # netstat=/bin/netstat
+ # route=/sbin/route
+ # hostnamecmd=/bin/hostname
diff --git a/app-admin/quickswitch/quickswitch-1.05.ebuild b/app-admin/quickswitch/quickswitch-1.05.ebuild
index ab9f3d539ebe..24b21cea6b25 100644
--- a/app-admin/quickswitch/quickswitch-1.05.ebuild
+++ b/app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -1,38 +1,28 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-IUSE="ncurses"
+EAPI=6
 
 DESCRIPTION="Utility to switch network profiles on the fly"
 SRC_URI="mirror://sourceforge/quickswitch/${P}.tar.gz"
 HOMEPAGE="http://quickswitch.sf.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc s390 amd64"
+IUSE="ncurses"
 
 DEPEND=">=dev-lang/perl-5.6.0"
 RDEPEND="ncurses? ( dev-perl/CursesWidgets )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.05-fix-paths.patch )
+
 src_install() {
 	dobin switchto
-	dosed "s:/etc/switchto.conf:/etc/quickswitch/switchto.conf:" \
-		/usr/bin/switchto
-	dosed "s:/etc/switchto.last:/etc/quickswitch/switchto.last:" \
-		/usr/bin/switchto
-	if use ncurses; then
-		dobin switcher
-		dosed "s:/etc/switchto.conf:/etc/quickswitch/switchto.conf:" \
-			/usr/bin/switcher
-	fi
-
-	dodir /etc/quickswitch
+	use ncurses && dobin switcher
+
 	insinto /etc/quickswitch
 	newins switchto.conf switchto.conf.sample
 
-	dosed "s:/etc/switchto.last:/etc/quickswitch/switchto.last:" \
-		/etc/quickswitch/switchto.conf.sample
-	dosed "s:/usr/local/sbin/iwconfig:/sbin/iwconfig:" \
-		/etc/quickswitch/switchto.conf.sample
-	dodoc README
+	einstalldocs
 }
diff --git a/app-admin/sud/Manifest b/app-admin/sud/Manifest
index f5217a38e814..da3615d7568d 100644
--- a/app-admin/sud/Manifest
+++ b/app-admin/sud/Manifest
@@ -1,4 +1,5 @@
+AUX sud-1.3-fix-build-system.patch 649 BLAKE2B 00563b734e50ef85636603e09b32f9db3ad0d072aac61291ae0a0447cbdf2aa04dd40ac0d37e0d03147dac242bf4251eb4c1cbb9b3897008b9fb3e6e06622374 SHA512 9c8151b09d9a1cb06a523c9ddc34ddf18adcc1a45c89805f9c8865a69890810403e7e6b5d9fe6d034f3f68700d88044ce318dd1345ec5843540a404dc54d4e34
 AUX sud.rc6 387 BLAKE2B a1eef9ef30a73c15ea8daf2f2a266cacbcf38dfc2fda1e481b9693c24c5fe5ba726a9154b8dc4a072aa008d5d96ec820f8b1dff375b16ef28f5b5230961fbac1 SHA512 07feba04e36df02e5cab6260f5943d4a72c3549a604d9db33a2f4734b39a60a3514899c0831bf1fe5ce073889989d42f0ae64d1f7bb0735fca7fd2584887364b
 DIST sud-1.3.tar.gz 117542 BLAKE2B e9d28c119e25d3cf0434d10c04d34fbdd0a52fbea84ee09b2dc835ec9eabf30fc91895fd691febbf57590b790febe04b1b45d354f7e2fcab513608de85419746 SHA512 54b58b54e665133dcc40f00708a929bc038df1e2ce18514d830e3f3f823110bd27a209771fc378c2bcd372692e168f55150f12893e2fbd433b51e2173dbd410e
-EBUILD sud-1.3-r1.ebuild 1259 BLAKE2B 881ce5ca50b297c520d31c6e689e990a2fa9cd5cb0e8774b8acb80b96206c11aa98bc8397d5d34fa56255cd3115a3311377138f9ade53ba29adcef13f6486e17 SHA512 83c13836a02c45d372856a24e316af73bfd1fe50201d420309482e2a1359507a02472ae55865a737d54812cfcc4a5a07b7caaa3b2301c57c6fd887ee2d601da3
+EBUILD sud-1.3-r1.ebuild 697 BLAKE2B 8f4b85dfc0efbbbe4e63627f22e6e98eb11aeda2a95f8a486cfd7fdb1bc614a3b15a9c6e6fde6a0012606252a4a1a8f3bd26b8fb0176a438eb421ee60134bb15 SHA512 0eaa293326637f1456527a97d68118471bc897643ad6766c19f4c7828b31c23648dffc73827e429555c06727c58d5330d04cd36ad48b0d34d3568060ec5ce87a
 MISC metadata.xml 719 BLAKE2B 5e27e4bdaf382f590f9f5eab598c94e62ac353e0694e3e7094f37637dfc3201e8f23a52d2c2d7f9bfffb574b59838bdb41ebc746a389ebb8a6e89ac0fec2ee9d SHA512 94b453b02af38033f480fa0cd38b6614f4f972a1f2f826e56eda1668db212a31bd6643146f40ba220f77e748c6ba29935527b0a363fcc3cb87e617cfc2ee5938
diff --git a/app-admin/sud/files/sud-1.3-fix-build-system.patch b/app-admin/sud/files/sud-1.3-fix-build-system.patch
new file mode 100644
index 000000000000..5937d3f0a8e6
--- /dev/null
+++ b/app-admin/sud/files/sud-1.3-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/login/Makefile.am
++++ b/login/Makefile.am
+@@ -2,5 +2,5 @@
+ ilogin_SOURCES = login.c
+ ilogin_CFLAGS = -Wall
+ 
+-install-data-hook:
+-	chmod 500 $(sbindir)/ilogin
++install-exec-hook:
++	chmod 500 $(DESTDIR)$(sbindir)/ilogin
+--- a/su/Makefile.am
++++ b/su/Makefile.am
+@@ -4,5 +4,5 @@
+ 
+ INCLUDES = -I../sud
+ 
+-install-data-hook:
+-	chmod 555 $(bindir)/suz
++install-exec-hook:
++	chmod 555 $(DESTDIR)$(bindir)/suz
+--- a/sud/Makefile.am
++++ b/sud/Makefile.am
+@@ -7,5 +7,5 @@
+ #INCLUDES = -I..
+ CLEANFILES = conf_lexer.c conf_parser.h conf_parser.c
+ 
+-install-data-hook:
+-	chmod 500 $(sbindir)/sud
++install-exec-hook:
++	chmod 500 $(DESTDIR)$(sbindir)/sud
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
index ef9d6f7005de..7c72435d9c4d 100644
--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ b/app-admin/sud/sud-1.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit eutils flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="A daemon to execute processes with special privileges in a nosuid environment"
 HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
@@ -14,32 +14,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-build-system.patch )
+
 src_prepare() {
-	sed -i -e \
-		's/install-data-hook:$/& install-exec/' \
-		-e \
-		's:chmod 500 $(sbindir)/ilogin:chmod 500 $(DESTDIR)$(sbindir)/ilogin:' \
-		"${S}"/login/Makefile.in || die "sed failed."
-	sed -i -e \
-		's/install-data-hook:$/& install-exec/' \
-		-e \
-		's:chmod 555 $(bindir)/suz:chmod 500 $(DESTDIR)$(bindir)/suz:' \
-		"${S}"/su/Makefile.in || die "sed failed."
-	sed -i -e \
-		's/install-data-hook:$/& install-exec/' \
-		-e \
-		's:chmod 500 $(sbindir)/sud:chmod 500 $(DESTDIR)$(sbindir)/sud:' \
-		"${S}"/sud/Makefile.in || die "sed failed."
+	default
+	eautoreconf
 }
 
 src_configure() {
-	append-flags -D_GNU_SOURCE
-	default_src_configure
+	append-cppflags -D_GNU_SOURCE
+	default
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog* README NEWS TODO
+	default
+
 	doman ilogin.1 sud.1 suz.1
 	insinto /etc
 	doins miscs/sud.conf*
diff --git a/app-admin/superadduser/Manifest b/app-admin/superadduser/Manifest
index cc59a988e6a6..c6110b535035 100644
--- a/app-admin/superadduser/Manifest
+++ b/app-admin/superadduser/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.9/superadduser 13973 BLAKE2B 4458ad50a2699293ef2e5ff9cc63051d91d0892f39437f97dd6d7dd12c35e06ef2e2d327814c391790b471d596c64b4060def0abd5d05def2457fd21e736fa2a SHA512 3eac518597abf1ce6b5562137003c875df41f30df3394a2afdb3458833736c73ad47e94edcda06f71c207c203a43449b8f740e3345f853976e550657b372bdba
 AUX superadduser.8 517 BLAKE2B 25817073bfd4effb62fb18a8a7721cffe9dd376d88734a3dea337ba9c6cfc3ad4663c56e44bf44ce70ddf23113d3691e6ffdaf6bd5a6eb67add357fc47d46d06 SHA512 f07bc575a8ee89b2fcc27714eac4ad5c7129dedc2fa927d5490735109594f81dbe0fd7057f5c1317f3aa1905a1ac5a51e589d5eb9484b528b0174380e6c3297f
-EBUILD superadduser-1.0.9.ebuild 474 BLAKE2B 3f6660c90f867f061ee57ed6c2d3a2c93c981e72e58dc38e3c95f57e108ed011b97e348a3e9d5eb97ac96e1f9462f001781bfafb0914e8112adc7df1fa8127e8 SHA512 ebbbbb3e0d84d670ad93f4bd3595e6e3b9c7050bdb8360da3fdd472bf8f0682c0a7057c0d8fb8c2a29a32b8fea5a28eb1deed2b7f3bae7a2810a750c7d6e1504
+EBUILD superadduser-1.0.9.ebuild 489 BLAKE2B 4bc24eb06cc39fe01ba410fb2f451fc46ca2fb1019761580741c71481a5992fba1960f2d6589447c3f29781e7c1c9d657cdc23fcc2325ae6c85fece8b842780c SHA512 04ba7cd16d4554611d333c25aa34d23cc11d37e8cd9e32656908d58d330be6b3effcc454f78e0d0542994704a7e6edacde0f503343ce45d5c3217a764128ace6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-admin/superadduser/superadduser-1.0.9.ebuild b/app-admin/superadduser/superadduser-1.0.9.ebuild
index 2b2feb3db800..ec577756b792 100644
--- a/app-admin/superadduser/superadduser-1.0.9.ebuild
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="Interactive adduser script from Slackware"
 HOMEPAGE="http://www.interlude.org.uk/unix/slackware/"
 SRC_URI=""
@@ -12,7 +14,9 @@ IUSE=""
 
 RDEPEND="sys-apps/shadow"
 
+S=${WORKDIR}
+
 src_install() {
-	dosbin "${FILESDIR}"/${PV}/superadduser || die
+	dosbin "${FILESDIR}"/${PV}/superadduser
 	doman "${FILESDIR}"/superadduser.8
 }
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index a8cf54b3e4a5..a838a396afc6 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -1,5 +1,6 @@
-AUX sysrqd-config.patch 494 BLAKE2B 6fe771456c36e434341186c07df7317afbd086efe7a57e53bb019581f38d8e04babe864c8707b37c7c5c7a164c43197c93d0b6bf59e58936d99f18e71d825763 SHA512 5dc0d43e571a8d75c61914846edb87437b81c5bb467a5a16fa927a82d5b42d40b45e3a1cfcf98165a417cd175192207ed8a5d23f39f1c5844d9b589c7eae2337
+AUX sysrqd-14-fix-build-system.patch 615 BLAKE2B 25de1ca0a421ab37737613533fb68819a6f611271b44c7381963476e01ab62a204bf61a1bf5a61100d1199601d7db8f7010cdd1207eeb50dff9768f34b7028fe SHA512 2ecb26c68a4a7382af1c09d81b71544e9621c0425fcd7577be1e4b929b808989d223d128affb0107724423624f3bf550327c92cb9c56676d45f49707ee7d1321
+AUX sysrqd-config.patch 421 BLAKE2B 9cc04c7c31c39f1015b95aaf5c695a2221b65d2c471506b9f3e836fec43585e7e21d7fa7a01c4cdd7815f9c1ebb10800ca1cfccabd397223eb6b3f700f8cd54d SHA512 5dd351220cbb10a09d6c6f0bae07a37fc678988467a8a1cff2075217a82eb4bbfc6f2155b47b71159e3442f8d25bbff539a3e2a61f91829d6dae7820e647fca8
 AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f088ffc2a32077cf6e18bc3413106724d7fe024bea9720f6f20c5a28a5fb5a775a219ed7c95e4 SHA512 9845a09cfa20ee9cd09e61e142cf53aaf482909ce3ec1401743864823a7bd45ced812fb235eef2adb914c3c624e227fa5936b73e1b83d8a3888fb25498980918
 DIST sysrqd-14.tar.gz 4759 BLAKE2B 3ef8b2f5092a899753da487d0a82a71d2d93d0c6a70689b5923fa900f2766de15fa2e416cb667d800dac19499218a0246941b8c52bfe4421af774ccecc62222e SHA512 efad48be3974923ec14d0958e788115c9273bc29b4f03853e6e087f6af872299ea57d42f885be19ff4eeaffa577ecf1c53ea2adb2f84e1487bb2511597b89cb2
-EBUILD sysrqd-14.ebuild 1445 BLAKE2B 591e1d250557bcca641dd741e36215c08c0b6f2b3f585e9cbdece3caf53c97727a5b46fd82e41be894baf602ef08f3ae623112090081a5df41ebf212cbd97b65 SHA512 e9f5bfec1305270a52e179516d8060d6c220b2eff281232253a37317173a51ff60c04e857361d36495537775bf21330e4d6be2dfbf2a6c349193d1b6f1ca7c1e
-MISC metadata.xml 531 BLAKE2B 86c0d187a5b5898a509e528ea3829a5eaa7a3c40fa812866ed0089c4f226978d08eefa488219024aa685c0b0059aad7e668ec504d39a756c9563c3d44d0e6041 SHA512 38c2de89d5f31d94e4756e76a3b2cba02c4907d84b2fb7d977ce5ae1b322ea92a096449dc5de5a85d4b6175e0e9a7529c01ef90e4eaf9396fcdeecde48aac7dd
+EBUILD sysrqd-14.ebuild 1395 BLAKE2B 4368fe901f94f14e010dfa5e8f4648f13dd93727a521e9db49398cc2704482a1d62e633a8acf5a4633b1903224d5c99357a08cfe25118aea695fc9297d06c1ab SHA512 11080e964bfa37504a653432ea99910ac469c969859f5301ee86b7f80db4a5bd147af3da5b8cf6119473959de2110195978d9d00c3589f8f61d12f4845cc32ae
+MISC metadata.xml 496 BLAKE2B 9da66d775bffc6860de235edd1fd5c2c26c6fc2c42b244ce21f662fa59c1c2b08b775cd2a67fd7c96b418a93882776da142b825c5adbfdcb7733f4cbd83cafcf SHA512 f5a4047c8630f430d87d34685a12d3e72409d1fe0f69973f882143988a0d2955b48ed27e6a2d172413da8ff3ace899b8e6b7f749a72259b92ff7ade719c49ebc
diff --git a/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
new file mode 100644
index 000000000000..2668c3c0c491
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,15 +5,15 @@
+         -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare \
+         -Wunused -Winit-self -Wpointer-arith -Wredundant-decls \
+         -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn \
+-        -std=gnu99 -pipe -DSYSRQD_VERSION="\"$(VERSION)\"" -O3
++        -std=gnu99
++CPPFLAGS += -DSYSRQD_VERSION="\"$(VERSION)\""
+ 
+ SBINDIR=$(DESTDIR)/usr/sbin
+ #MANDIR=$(DESTDIR)/usr/share/man/man1
+ INSTALL = install
+ #MAN=sysrqd.1
+ 
+-$(BIN): $(O)
+-	$(CC) $(LDFLAGS) -o $(BIN) $(O)
++all: $(BIN)
+ 
+ install: $(BIN)
+ 	$(INSTALL) -d -m 755 $(SBINDIR)
diff --git a/app-admin/sysrqd/files/sysrqd-config.patch b/app-admin/sysrqd/files/sysrqd-config.patch
index ce463814d1e3..56c6afb60804 100644
--- a/app-admin/sysrqd/files/sysrqd-config.patch
+++ b/app-admin/sysrqd/files/sysrqd-config.patch
@@ -1,5 +1,5 @@
---- sysrqd.c.orig	2009-11-05 14:58:21.644471772 +0100
-+++ sysrqd.c	2009-11-05 14:58:43.276472005 +0100
+--- a/sysrqd.c
++++ b/sysrqd.c
 @@ -40,8 +40,8 @@
  #define BIND_MAX_LEN 16
  #define PROMPT "sysrq> "
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
index b86ebd13ff32..97a6a018180f 100644
--- a/app-admin/sysrqd/metadata.xml
+++ b/app-admin/sysrqd/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>wschlich@gentoo.org</email>
-	<name>Wolfram Schlich</name>
-	<description>Primary maintainer</description>
-</maintainer>
-<longdescription>
-sysrqd is a small daemon intended to manage Linux Sysrq over network.
-Its philosophy is to be very responsive under heavy load and try to
-be somehow reliable. Authentication is made by clear password.
-</longdescription>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+	</maintainer>
+	<longdescription>
+		sysrqd is a small daemon intended to manage Linux Sysrq over network.
+		Its philosophy is to be very responsive under heavy load and try to
+		be somehow reliable. Authentication is made by clear password.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
index 3475122a5807..249bbce77e12 100644
--- a/app-admin/sysrqd/sysrqd-14.ebuild
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
-IUSE=""
 DESCRIPTION="daemon providing access to the kernel sysrq functions via network"
 HOMEPAGE="http://julien.danjou.info/projects/sysrqd"
 #SRC_URI="http://julien.danjou.info/${PN}/${P}.tar.gz"
 SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-config.patch"
-}
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-config.patch
+	"${FILESDIR}"/${PN}-14-fix-build-system.patch
+)
 
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o sysrqd sysrqd.c
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
@@ -31,8 +31,8 @@ src_install() {
 	local bindip='127.0.0.1' secret
 	declare -i secret
 	let secret=${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}
-	echo ${bindip} > sysrqd.bind
-	echo ${secret} > sysrqd.secret
+	echo ${bindip} > sysrqd.bind || die
+	echo ${secret} > sysrqd.secret || die
 
 	diropts -m 0700 -o root -g root
 	dodir /etc/sysrqd
@@ -41,7 +41,7 @@ src_install() {
 	doins sysrqd.bind
 	doins sysrqd.secret
 
-	dodoc README ChangeLog
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index aef0a6c0c9f1..7012fc47fa8c 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -1,5 +1,4 @@
 DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2
 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
-EBUILD xtail-2.1-r1.ebuild 753 BLAKE2B 36cd2bd7302bc2866fce0ae4589d0b8b45c0beca1d7bacc035465d1b38c5ce195265b70ab6f53a46e17fb1dfbf206f89d2ce09166837cb496e532e5c55126637 SHA512 f238d06a5039d06dd361681eba12a420cba02886e0b78fedba469b4b9a680876fc1c647fc3fb7d4e77aa5e8b02628d7d486f21f556c02211e90250218d4382ef
-EBUILD xtail-2.1.ebuild 498 BLAKE2B 1757afd09ad71f48b4d55c587903e6303668e197ebbce6c7021e7beb4110f6faf6acd576648d2ab3351594af433ff76ecf1961ba9855701ce12c452c4ac7f039 SHA512 5e94c8561c2f633cf07d5f144029562c99084fa905f49ab1f3c0292bcf945506fb1f1c95ee63aa785ce9809583661743cd104ae2018e7e27c316fc353db2cfac
+EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
 MISC metadata.xml 437 BLAKE2B fb96dc20e1001cb139100ee255eb2fc628eb4e8b17d4f665bebce18c2ecac3aa7b965254dc8052fec2b783dee37296c6837f4e0f60a2e038b62e1e80840d381c SHA512 473485579b4adafbd9f25cfb9e301e08c6c92d145c8028f3860962ee37be59491686bd413c744674a5a91345d398afa7ada96e96ea5af9200e7cfde38b10f7e1
diff --git a/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
index 9506b3e7e06c..9f010062d31f 100644
--- a/app-admin/xtail/xtail-2.1-r1.ebuild
+++ b/app-admin/xtail/xtail-2.1-r1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tail multiple logfiles at once, even if rotated"
 HOMEPAGE="http://www.unicom.com/sw/xtail/"
-SRC_URI="http://www.unicom.com/sw/xtail/${P}.tar.gz
+SRC_URI="
+	http://www.unicom.com/sw/xtail/${P}.tar.gz
 	http://www.unicom.com/files/20120219-patch-aalto.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
+
 DEPEND="app-arch/unzip"
 
-src_prepare() {
-	epatch ../0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
-	epatch ../0001-xtail.1-remove-SIGQUIT.patch
-	epatch ../xtail_2.1-5-debian-local-changes.patch
-}
+PATCHES=(
+	"${WORKDIR}"/0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
+	"${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch
+	"${WORKDIR}"/xtail_2.1-5-debian-local-changes.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake
+	default
 }
 
 src_install() {
diff --git a/app-admin/xtail/xtail-2.1.ebuild b/app-admin/xtail/xtail-2.1.ebuild
deleted file mode 100644
index 656f0b7240e3..000000000000
--- a/app-admin/xtail/xtail-2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="Tail multiple logfiles at once, even if rotated"
-HOMEPAGE="http://www.unicom.com/sw/xtail/"
-SRC_URI="http://www.unicom.com/sw/xtail/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin xtail || die
-	doman xtail.1 || die
-	dodoc README
-}
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-30 01:11:30 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-30 01:11:30 +0000
commit	76dfef0cec9170000357d2f354e412daf48941fc (patch)
tree	56647120c0ee20ab3494475c86722034cd194b02 /app-admin
parent	ccf84bcd604130256d1377cd58f0a634ae6ee20f (diff)