[gentoo-commits] repo/gentoo:master commit in: x11-misc/skippy/, x11-misc/skippy/files/

[David Seifert]

commit:     8a7e529252283330d888e66f71142ed095641f73
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Feb  6 09:54:37 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 22:46:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7e5292

x11-misc/skippy: EAPI bump 2 -> 6, shorten DESCRIPTION

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3841

 x11-misc/skippy/files/skippy-0.5.0-Makefile.patch  |  4 +--
 x11-misc/skippy/files/skippy-pointer-size.patch    |  4 +--
 ...{skippy-0.5.0.ebuild => skippy-0.5.0-r1.ebuild} | 30 ++++++++++------------
 x11-misc/skippy/skippy-0.5.0.ebuild                |  4 +--
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
index 957d3ba..5c8c64b 100644
--- a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
+++ b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
@@ -1,7 +1,7 @@
 Don't use LDFLAGS to pass libraries.
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,14 +1,12 @@
 -PREFIX = /usr/local
 +PREFIX = /usr

diff --git a/x11-misc/skippy/files/skippy-pointer-size.patch b/x11-misc/skippy/files/skippy-pointer-size.patch
index 8a7ee42..7f59711 100644
--- a/x11-misc/skippy/files/skippy-pointer-size.patch
+++ b/x11-misc/skippy/files/skippy-pointer-size.patch
@@ -1,5 +1,5 @@
---- wm.c
-+++ wm.c
+--- a/wm.c
++++ b/wm.c
 @@ -258,7 +258,7 @@
  		return 0;
  	

diff --git a/x11-misc/skippy/skippy-0.5.0.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
similarity index 66%
copy from x11-misc/skippy/skippy-0.5.0.ebuild
copy to x11-misc/skippy/skippy-0.5.0-r1.ebuild
index 1627520..7088be7 100644
--- a/x11-misc/skippy/skippy-0.5.0.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
-DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality with various WMs"
+DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality"
 HOMEPAGE="http://thegraveyard.org/skippy.php"
 SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="media-libs/imlib2[X]
@@ -25,25 +25,21 @@ DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-pointer-size.patch \
-		"${FILESDIR}"/${P}-Makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+)
+
+DOCS=( CHANGELOG skippyrc-default )
 
 src_compile() {
 	tc-export CC
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CHANGELOG skippyrc-default
+	default
 }
 
 pkg_postinst() {
-	echo
+	elog
 	elog "You should copy skippyrc-default from /usr/share/doc/${PF} to"
 	elog "~/.skippyrc and edit the keysym used to invoke skippy."
 	elog "Use x11-apps/xev to find out the keysym."
-	echo
+	elog
 }

diff --git a/x11-misc/skippy/skippy-0.5.0.ebuild b/x11-misc/skippy/skippy-0.5.0.ebuild
index 1627520..2b01e3e 100644
--- a/x11-misc/skippy/skippy-0.5.0.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=2
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality with various WMs"
+DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality"
 HOMEPAGE="http://thegraveyard.org/skippy.php"
 SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2"