gentoo resync : 01.12.2017

3 files changed, 8 insertions, 34 deletions

diff --git a/net-mail/qprint/Manifest b/net-mail/qprint/Manifest
index 116c85428686..0edc8182b759 100644
--- a/net-mail/qprint/Manifest
+++ b/net-mail/qprint/Manifest
@@ -1,5 +1,3 @@
-DIST qprint-1.0.tar.gz 248872 SHA256 a92f02f2b1c12e29895df7ce200bd8001ce6be9ef092ef14284f94918719bfa8 SHA512 2cba2e4c986e51485f26988173d16bfdbecbc9e84aeb7abbf3e77fba8f9d5ad442c0d61a8d17f4b715c0ec0b3ec25b948438fa5c88a0777d7aff7b6d99c40a31 WHIRLPOOL 09a51ae9579ed2b21d4c1d2bfef0711a1be775768bb4dd41a44e3f201f2d07309f1210cac046f9cd34c0070a2c42276039ae28391d676c7b915ecd2fe6c570e4
-DIST qprint-1.1.tar.gz 358575 SHA256 ffa9ca1d51c871fb3b56a4bf0165418348cf080f01ff7e59cd04511b9665019c SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca WHIRLPOOL 846d89b7775cd2d913d98ba72277a6f5e3001f4d3006c41810707682e40cef0abee546e75a9eefa94aa09fcb6afb2b5849409978a5a124c18233357896e4e48e
-EBUILD qprint-1.0.ebuild 642 BLAKE2B 97e2e042b7644aa7163516d84cbb1108f7be3c4519a1673672faeeaeb329b9f937978fc275ca09812736489f2691d08b46ac94df755844658ede2ae066cecb2c SHA512 4ea8900a789344b01c996b118573286b975a2e84e17e488a6211b3f1dffa8e93df6367f638e4b2aaccdc18de5e9357bfc4aa331cb8858f5a906bc1523dcb610c
-EBUILD qprint-1.1.ebuild 531 BLAKE2B e89d282f712c1f0d40fcd367c02cca22daaee2f4792e97980c139b5dbc7c2415b744d2fa6c4635d22fe2ccfa981c10bb40bf486cde5a80d44b08650909b41c61 SHA512 0603260e8b1d812ef1e763a071b4ded73140d68fcd854dc5ff6709d24aef001a116c1405a78e12296239d68fd127332b530f1ba06d586fd9d054c9348f852cea
+DIST qprint-1.1.tar.gz 358575 BLAKE2B 6c2a756b3e245584ed4ff81a072a63f29ee14cca5a61f7d376b8794a91c69e604fb33bbde310e870cc712d7fbeb2758eb5e649a7b153bf29807cbd891e3f4c1a SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca
+EBUILD qprint-1.1.ebuild 513 BLAKE2B 2941c85ad80b81b12c7f308495842268f84e35c0aee4ad7694576683953b764297f1ffba349541740d86fa11cbcbcb1119bc5f9bee868262d3e346b2d4d0ceca SHA512 985ba623870ffce67b0b521ec9b18be5fd33dd85e797545a3683831e1046c6b151189535cf0c9a40f9ccafb6f95b51083e0dd5636385731c0e12cde4d1a8fcac
 MISC metadata.xml 405 BLAKE2B 1aaeedae887860dce185acbb17030457dfdb18e7220f8f4f9bf88194643e31ad5c8e710b74f69cbf7db8ec23e88f0c9c254da5eb226c515d87999934809abd2e SHA512 65f4d4963f91de85a1f5869ceb92f2c09ad2b644d37fe19f21af61ab9484d9ecee6a84f7206859ee970e315b7fffac9328ec4bac84ce16e8a83311cb9900070a
diff --git a/net-mail/qprint/qprint-1.0.ebuild b/net-mail/qprint/qprint-1.0.ebuild
deleted file mode 100644
index cd6d620d27c6..000000000000
--- a/net-mail/qprint/qprint-1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
-HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
-SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc COPYING INSTALL README *.html qprint.pdf qprint.w logo.gif
-}
diff --git a/net-mail/qprint/qprint-1.1.ebuild b/net-mail/qprint/qprint-1.1.ebuild
index 59789807acbe..abe9228eea65 100644
--- a/net-mail/qprint/qprint-1.1.ebuild
+++ b/net-mail/qprint/qprint-1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
 HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
@@ -9,12 +9,13 @@ SRC_URI="http://www.fourmilab.ch/webtools/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~ppc-macos"
 IUSE=""
 
 src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
-	emake DESTDIR="${D}" install
-	dodoc INSTALL README *.html qprint.pdf qprint.w logo.gif
+	local HTML_DOCS=( *.html )
+	default
+	dodoc qprint.pdf qprint.w logo.gif
 }