4 files changed, 67 insertions, 19 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 10a819040028..ad52c8618ef7 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index da7f27817916..5cf28acc5969 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,6 +1,7 @@
 AUX evilwm.desktop 167 BLAKE2B 6de59f5da259ce3615e2bea2112691e8fa28c07d03a5155deba64b8a2fab2aae3160a1f896e7dbde51ab0068e7ba0dd083e51f5615a8b632c62e6a67171c3937 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288
 DIST evilwm-1.0.1.tar.gz 31468 BLAKE2B 64ee8c0e429c4eefd908a700e727845f2de1e7531cdfb51133014c05cb350eb0bed02476f8a81155b5f70b6b164279ce220aa82d2e9ec8d017b54076a7158f6e SHA512 f9a5abe13ce7ae9fa9a72962316dd7a847419f29a6ab7270315da5a71058c51bde620d34fa690f9de29838490e1da68efe72c6ef33745d69e3e026de98ed3938
 DIST evilwm-1.1.1.tar.gz 40150 BLAKE2B b595e9267fb7421bdcf1ce1c6f37559ab62e58beb11aa755bd21a141ad66387a7e95106231277caff84579bfd61183a554427319c7d85ec20716c69fc3cd0968 SHA512 a11af475f057bf18adef339f4772ff1291a25a19c86b7f18a4ce7821e70b039c256151232da6cca616ceea7d9242a60b055d654ce26e85384c6ba687ede7898d
+EBUILD evilwm-1.0.1-r1.ebuild 1255 BLAKE2B b3597ad8b82910d1ec1b0b0937f86349641d870ee1c1c5bc10ae02b81a190cec99371a499b37e3bff102b50437f4e0055c8dafb3f8804ac46f0353c893a1385d SHA512 d4c1ccc02ce2c6d6858dba81d115728f8e949e8c96aae968909da6adfc2e2efd0edbd89df7e869c2e8c78133c79bcbaec2ac260f078a017c3c4191889c569ef6
 EBUILD evilwm-1.0.1.ebuild 1333 BLAKE2B 813d7839453fb3e3050719da864edb445d4d3000add2af2840b1120fe75f8efc95c4467a5aa2cd4d329d7d53f33e51d81151c8270961d691dd8d96bc0ae59ed1 SHA512 f29eb0322d8be8125dd4d07eac06470ec838134a3c5fba226d7fdb92f7862631048e129ecc0ba947e8d479510d2f5be496a4d8b077109239e2f49479d6c89c74
-EBUILD evilwm-1.1.1.ebuild 1062 BLAKE2B 2fd9dc928887c55a9562b02196a55f3cae2213a5c1eb6e54b05e36d97f8797f095068ebefa1e2ac6f7b6765d1c68f7c31c503d303f8a9dc9b8b118c9e28d5151 SHA512 06a4a73ff067eb3e2740730e2e753aef6d1aff861d421961a5f490010db87128fd04e286c4f1bcb9353e3294909c2f1d5db73fdcf0db53e025cd908aafffb1bd
+EBUILD evilwm-1.1.1.ebuild 1123 BLAKE2B 9d8d83d49951515cd36b1d2fd59667f921b9ad96713ab0a4948decb152f837d104f711a22e6f9fdc6e39042af3a57f595dcecc434e93f0f8858c6951cc18b7a2 SHA512 0c6064438b6efa1c4a28b23b11d2685b5e0af45219e9b694efd129b9faf3599db62da6a20d3c54da5b50ea725316888e440c4fb8c89a5edb4dbafda4736182b3
 MISC metadata.xml 695 BLAKE2B 0932d8335a874bc43b383f3fc13d7330c6826788434caf8b7527287f5d7079d80b89f4de8945870e8d1f07563c3709896add0bd1631a32de29e93e99fa09d329 SHA512 dbd50d051ed652fea10abaeb714aa1270e82c0a2b5a6f2cb34693bbfa86c787158d3f6ece8bef096bd64f9703fdc4bc6c1d379f4e0fe74a3fd2274addc3bc33a
diff --git a/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..a23d0ebd5efb
--- /dev/null
+++ b/x11-wm/evilwm/evilwm-1.0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop toolchain-funcs
+
+DESCRIPTION="A minimalist, no frills window manager for X"
+HOMEPAGE="http://www.6809.org.uk/evilwm/"
+SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXrandr"
+
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+src_prepare() {
+	default
+	sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
+		-i evilwm.h || die "sed font failed"
+	sed -i -e '/^CFLAGS/s/ -Os/ /' \
+		-e 's/install -s /install /' Makefile || die "sed opt failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" prefix="\$(DESTDIR)/${EPREFIX}/usr" XROOT="${EPREFIX}/usr" LDPATH="-L${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="\$(DESTDIR)/${EPREFIX}/usr" install
+
+	einstalldocs
+
+	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+	domenu "${FILESDIR}"/evilwm.desktop
+}
diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
index f7bf3c01701e..e1ae05372ef6 100644
--- a/x11-wm/evilwm/evilwm-1.1.1.ebuild
+++ b/x11-wm/evilwm/evilwm-1.1.1.ebuild
@@ -1,45 +1,45 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs
-
-MY_P=${P/_}
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A minimalist, no frills window manager for X"
 HOMEPAGE="http://www.6809.org.uk/evilwm/"
-SRC_URI="http://www.6809.org.uk/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
 
 LICENSE="MIT 9wm"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="x11-libs/libXext
 	x11-libs/libXrandr
-	x11-libs/libXext"
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
+	default
 	sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
-		-i evilwm.h || die
-
-	sed -e '/Encoding/d' \
-		-i ${PN}.desktop || die
+		-i evilwm.h || die "sed font failed"
+	sed -e '/Encoding/d' -i ${PN}.desktop || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install || die
-	dodoc ChangeLog README TODO || die
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install
 
-	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}"/${PN}
+	einstalldocs
+
+	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/${PN} || die
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+	domenu "${FILESDIR}"/evilwm.desktop
 }