x11-wm/i3-gaps: Fix live ebuilds (fixes #1)

x11-wm/i3-gaps/Manifest

@@ -1,6 +1,6 @@
 DIST i3-gaps-4.13.tar.gz 3920508 SHA256 e80c07e525a07f2d3d2f02d282774d3264b6d1f165713c9903c06626ba4d2571 SHA512 9b0c888c1c412622282f5e56ba6763eba3af88682d1652d1a1e6ce4e7fcdbec30e4fd6731b7e4d306bd33871a2581e0979714b47c9614210302c491ce9366ba8 WHIRLPOOL 6a4e9ecb2940aa05dd4f1b873903929ba13b117f2a80fc3d8707400a0923925d3d0232df12bd24fd14e33be6ef99d441486a13203ee66eb9d5d0fcf58c4ba26d
 EBUILD i3-gaps-4.12.ebuild 1462 SHA256 a2c6a2275db721fc895a71cafab8256e3b8fa8ef4263c6c53573b331e0daebbd SHA512 514398e2e0d10061c4fe53c492157fc238e785deecf73de39f6cc66f940234bd2ce01c8211a6d7d8f1a91809b551633ca843c7c907af78b518e4a3405cd6c674 WHIRLPOOL ed3a42f0c9a08a110094af295b371dc04aaf82d1117c559a25964fa323b91dacd2392c5b236b4f09e1f7d4d260f9c1363b952266c5a4f3b2622b8e1c6ae6c794
 EBUILD i3-gaps-4.13.ebuild 1944 SHA256 219e4172422102673ab2f2522dca222abb31a9e17f564770c92a39e819a1285d SHA512 a195df4e78c0218c334ed5c1e6deabf925c3cda69df0a72f4dd893530f428d765137ddba57585d22dc73b76b4799a934e08682badbbf51a1824825c230a3e892 WHIRLPOOL 085864b0ee567b5431380703648984ae0c756d89299dd94b5aa691064099482d3a04ea6ea367ae3f76764c34b18c8565f9240806e821abaeca4c8c50b34c67a0
-EBUILD i3-gaps-9998.ebuild 1463 SHA256 1fe23532b34d29d23d09aef393bb82e591d4c3cdd78010857c05628a6ac36539 SHA512 fb3fc3d81d8f968088d9f7810f9f61a83864c1d24154b30dd3f41b0d3dc488c1867ca017361c78678f308908e2df3d0fbdf81c0474ef3088bd34b9b03e07c477 WHIRLPOOL 89ad5b9a21b614d56940e7b593d1019625ed100befcdc76157438af83ee093199fb653e5a25dab4b3a3426fd6c30bca0e117d08fd71865422199c4a731405d63
-EBUILD i3-gaps-9999.ebuild 1463 SHA256 1fe23532b34d29d23d09aef393bb82e591d4c3cdd78010857c05628a6ac36539 SHA512 fb3fc3d81d8f968088d9f7810f9f61a83864c1d24154b30dd3f41b0d3dc488c1867ca017361c78678f308908e2df3d0fbdf81c0474ef3088bd34b9b03e07c477 WHIRLPOOL 89ad5b9a21b614d56940e7b593d1019625ed100befcdc76157438af83ee093199fb653e5a25dab4b3a3426fd6c30bca0e117d08fd71865422199c4a731405d63
+EBUILD i3-gaps-9998.ebuild 1830 SHA256 bf3a6ded10d233693a631c8b968061ab3c0ed874819b5d85328b3ae1ec493589 SHA512 dbc74870e03c3e6ee682d370d083739f0314f8de75ce2c09e60c900f6c9efba34c1b42de287a384c9e28311403cc2432c22089a8d401fdacf6bf83a263d31006 WHIRLPOOL 442ba85f02e6bab5f690e2e5dbb086569391ba0121995714e1e0e1e55627fb17f0d10e0a932c9f83601cb8370a7f49c2d70d0052d74b9d254b65d7c131940b11
+EBUILD i3-gaps-9999.ebuild 1830 SHA256 bf3a6ded10d233693a631c8b968061ab3c0ed874819b5d85328b3ae1ec493589 SHA512 dbc74870e03c3e6ee682d370d083739f0314f8de75ce2c09e60c900f6c9efba34c1b42de287a384c9e28311403cc2432c22089a8d401fdacf6bf83a263d31006 WHIRLPOOL 442ba85f02e6bab5f690e2e5dbb086569391ba0121995714e1e0e1e55627fb17f0d10e0a932c9f83601cb8370a7f49c2d70d0052d74b9d254b65d7c131940b11
 MISC metadata.xml 248 SHA256 f4665dceeb1ead4743f1e1171d67e342469e780cdbc5b5d5cf28bda0f736dfc3 SHA512 a8291477568fdda07c44adeb8b54e999c94735c215776400716a43c7409cb19208bc825fa5b2fcbcf4eeecb56a938c9dd2fd216021c60fa0dacb3da207685427 WHIRLPOOL aafad206002a04b7eb852c155486d8574f58a75850cce485ccd5a742c749d759dcfd3add32b41ef89f3ddf950b0bdcda4a10d266b4eb20c49910c2b18eaf1ab7

x11-wm/i3-gaps/i3-gaps-9998.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-inherit git-r3
+inherit autotools git-r3
 
 DESCRIPTION="i3 with more features"
 HOMEPAGE="https://github.com/Airblader/i3.git"
@@ -42,26 +42,40 @@ RDEPEND="${CDEPEND}
 	!x11-wm/i3"
 
 DOCS=( RELEASE-NOTES-${PV} )
+BUILDDIR="${S}/build"
 
 src_prepare() {
 	default
-	cat <<- EOF > "${T}"/i3-gaps
+	eautoreconf
+	sed -i 's/-non-git//' I3_VERSION
+	if has nodoc ${FEATURES}; then
+		sed -e 's/\(AM_CONDITIONAL(\[BUILD_DOCS\],\).*/\1 false)/' -i configure.ac || die
+	fi
+	if has noman ${FEATURES}; then
+		sed -e 's/\(AM_CONDITIONAL(\[BUILD_MANS\],\).*/\1 false)/' -i configure.ac || die
+	fi
+	cat <<- EOF > "${T}"/i3wm
 		#!/bin/sh
 		exec /usr/bin/i3
 	EOF
-	epatch_user
+}
+
+src_configure() {
+	mkdir "${BUILDDIR}"
+	cd "${BUILDDIR}"
+	../configure
 }
 
 src_compile() {
-	emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
-	emake -C man/
+	cd "${BUILDDIR}"
+	emake V=1
 }
 
 src_install() {
-	default
-	doman man/*.1
+	cd "${BUILDDIR}"
+	emake DESTDIR="${D}" install
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3-gaps
+	doexe "${T}"/i3wm
 }
 
 pkg_postinst() {

x11-wm/i3-gaps/i3-gaps-9999.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-inherit git-r3
+inherit autotools git-r3
 
 DESCRIPTION="i3 with more features"
 HOMEPAGE="https://github.com/Airblader/i3.git"
@@ -42,26 +42,40 @@ RDEPEND="${CDEPEND}
 	!x11-wm/i3"
 
 DOCS=( RELEASE-NOTES-${PV} )
+BUILDDIR="${S}/build"
 
 src_prepare() {
 	default
-	cat <<- EOF > "${T}"/i3-gaps
+	eautoreconf
+	sed -i 's/-non-git//' I3_VERSION
+	if has nodoc ${FEATURES}; then
+		sed -e 's/\(AM_CONDITIONAL(\[BUILD_DOCS\],\).*/\1 false)/' -i configure.ac || die
+	fi
+	if has noman ${FEATURES}; then
+		sed -e 's/\(AM_CONDITIONAL(\[BUILD_MANS\],\).*/\1 false)/' -i configure.ac || die
+	fi
+	cat <<- EOF > "${T}"/i3wm
 		#!/bin/sh
 		exec /usr/bin/i3
 	EOF
-	epatch_user
+}
+
+src_configure() {
+	mkdir "${BUILDDIR}"
+	cd "${BUILDDIR}"
+	../configure
 }
 
 src_compile() {
-	emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
-	emake -C man/
+	cd "${BUILDDIR}"
+	emake V=1
 }
 
 src_install() {
-	default
-	doman man/*.1
+	cd "${BUILDDIR}"
+	emake DESTDIR="${D}" install
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3-gaps
+	doexe "${T}"/i3wm
 }
 
 pkg_postinst() {