gentoo resync : 21.10.2017

3 files changed, 9 insertions, 33 deletions

diff --git a/app-misc/joy2key/Manifest b/app-misc/joy2key/Manifest
index 87558ae1b927..c1f7dea662b3 100644
--- a/app-misc/joy2key/Manifest
+++ b/app-misc/joy2key/Manifest
@@ -1,6 +1,5 @@
 DIST joy2key-1.6.3.tar.bz2 70545 SHA256 cf6f452632bb661cf889d843e9ebb9f4fe6ddf4bfe14193ebf74c2d1e2b89f50 SHA512 33767058cb32aa18a418d37f48d80200a99ce12b765ec758bde7efdda575ffc78af3039584fe3ef267baaacc3724b3203d858017c945824cc949b9cd6fe97bec WHIRLPOOL 26356d8afe214c8b93056f128db79b7476a709992ec606a4006b7bf44aca182bb25de5da9d0fc26500cd101c9a522e53c4ee7d373f4ed90afee3409b554789f8
-EBUILD joy2key-1.6.3-r1.ebuild 649 SHA256 c67db4c2bd336c3c9c9fc6767de62d52acaf59066aa42571640a4dcef8f0bbf1 SHA512 1d49d973a28070f40ed4c5596b71377c47d03a531c544c7471e48be02d94de1dcb6cc3510da24ecf376bf899af95c60f15eab042a05cae7fde92178d64f62def WHIRLPOOL 9f88af58657413186317d97601e5bdef3afe6a68315a79548cc74360680efb863147fca7957f02edd01ad89e323619734a75d7003dd3d9d8781ee69e544d100f
-EBUILD joy2key-1.6.3.ebuild 697 SHA256 4eb98d1ddc5c19ea593f99f526c0473ceed03b5987b6d132366887e6d35fc76b SHA512 af27ced2cd92749b5d437067a653167af5cb46c86c9b611560755c588faeb8306300318398d1d40b2a6201f5487a29e9317a04cdeb1ffc63b57d431df51e2e7d WHIRLPOOL 14989acefeba4f12d7b2974dde4fcbec019c4b6e2d421d48330fafa70c5272e76c5cca46fbdb2a61d3ef4062aa3ade8d2c1beb8fee20582e5368bd1ee5bf0818
+EBUILD joy2key-1.6.3-r1.ebuild 632 SHA256 6a14695114343bf73f170d328c711f01f0d326346b52db6395943f86dd51d892 SHA512 bddf8052faaed510f70e5590a2af27b15b05e8c5b39abb8040777fdae1db3c0b7d241af134052692e8b7b0ac718baec3e0d4768d1f25550da837f2d6377d2933 WHIRLPOOL cd1b3b42f67a93827d7a021e42aa6ec986b2039a31e48289c658dfa7dcf2f1872ec140ddbd723e776bec7a7d568c4d03a71a99f9941ad0ab3bcc9c0fe6524b23
 MISC ChangeLog 2900 SHA256 ef43afdb5fd2c2c4bd6fb2e1cbfe6835c2e7d8c681f93a9393e37d16c49e3836 SHA512 5aa4fadfcf2a88415ac53dc0c19304658297afc10aeda7780560ef2a883c059166482dcb6f7ceafcfa3006ca0b712fb19ecf04c6188cf2309038b04acf19e0b0 WHIRLPOOL 537faa45828ae4c713c38b6b29cf4878f376a9020fa329f2c494036178c7790bf096906b5d37665663e5bf515414bbec1a0742b2477881a84b976b2c32501ec2
 MISC ChangeLog-2015 2819 SHA256 8c5a472814cd3f1c73c83cad120269c149a6ad88ef52e4334c2a67ae252f1a12 SHA512 8c99835ab305020bc01e4bcd99b6182fde5e38c4a6a94eb6cd305fa85e86a1c49e0aef0cd156d9f5bd7296d810b02b7ed4b12b1612014fed7e311acf0b3bae32 WHIRLPOOL 0628d08532afd8f624be2ec7aff930ee555ff07c25d3b88ce68046cc45fea45afb60b79f321280b148e9c2901fc38055578e504e684326fb4314db8756b44061
 MISC metadata.xml 244 SHA256 b860937aaddf7a8a035790cf248fe56f4254ab949952ddaa07e2c8aa7383ee75 SHA512 4bb71014a1a32d8f334488977c78efe9058b5246c77ce6e60c099ad3e56b931cba7b95a3535f7c0a5f030cbac3efaeff8811a9fb43a9bf77eca0afaf0117f182 WHIRLPOOL a0ae200a4ba42e6b61342a9703f536fb070f90166acc62ac7a4d95fc28dd3fd26f3519198f7575973bb1cad5f2e1a93f925144409a517774a745cc7cbc63ece0
diff --git a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
index 38c8331331cf..11f1f0f98d09 100644
--- a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
@@ -9,19 +9,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="X"
 
-RDEPEND="X? ( x11-libs/libX11
+RDEPEND="
+	X? ( x11-libs/libX11
 	x11-apps/xwininfo )"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	X? ( x11-proto/xproto )"
 
+DOCS=( AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO )
+
 src_configure() {
 	econf --disable-dependency-tracking $(use_enable X)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO
+	default
 }
diff --git a/app-misc/joy2key/joy2key-1.6.3.ebuild b/app-misc/joy2key/joy2key-1.6.3.ebuild
deleted file mode 100644
index c8aeff36a5cb..000000000000
--- a/app-misc/joy2key/joy2key-1.6.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="An application that translates joystick events to keyboard events"
-HOMEPAGE="https://sourceforge.net/projects/joy2key"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11
-	x11-apps/xwininfo )"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )"
-
-src_compile() {
-	econf --disable-dependency-tracking $(use_enable X)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO
-}