overlay

commit: 554ab42856425e9a946ac21f228300e922d6f5c2
parent: c3590dde771888f8288a7c8acc433325989f1e43
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Thu,  1 Oct 2020 23:26:34 +0200

www-apps/stagit: Clean Version Bump, 0.9.4

Diffstat:
M
sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
25
++++++++++++++++---------
M
www-apps/stagit/Manifest
3
+--
D
www-apps/stagit/stagit-0.8.ebuild
26
--------------------------
A
www-apps/stagit/stagit-0.9.4.ebuild
24
++++++++++++++++++++++++
D
www-apps/stagit/stagit-0.9.ebuild
26
--------------------------

5 files changed, 41 insertions(+), 63 deletions(-)
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
-IUSE="custom-cflags debug +rootfs"
+IUSE="custom-cflags debug kernel-builtin +rootfs"
 
 DEPEND=""
 
@@ -114,12 +114,15 @@ src_configure() {
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
 		$(use_enable debug)
+		$(use_enable kernel-builtin linux-builtin)
 	)
 
 	CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}"
 }
 
 src_compile() {
+	use kernel-builtin && return
+
 	set_arch_to_kernel
 
 	myemakeargs=(
@@ -132,17 +135,21 @@ src_compile() {
 }
 
 src_install() {
-	set_arch_to_kernel
+	if use kernel-builtin; then
+		./copy-builtin /usr/src/linux || die "Failed to copy in current kernel"
+	else
+		set_arch_to_kernel
 
-	myemakeargs+=(
-		DEPMOD="/bin/true"
-		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	)
+		myemakeargs+=(
+			DEPMOD="/bin/true"
+			DESTDIR="${D}"
+			INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+		)
 
-	emake "${myemakeargs[@]}" install
+		emake "${myemakeargs[@]}" install
 
-	einstalldocs
+		einstalldocs
+	fi
 }
 
 pkg_postinst() {
diff --git a/www-apps/stagit/Manifest b/www-apps/stagit/Manifest
@@ -1,2 +1 @@
-DIST stagit-0.8.tar.gz 17924 BLAKE2B 8ccffd5327143752ba273779a9e0b2a64f3dbcfd2df7449bbedfff9939196c63705cccf7796a2e556972aab4fd1c75f39085f68a8922c26c53a80cc7cc371ad3 SHA512 76bedf4e8dcb84f4426db72154a33900f6853a31733f8b18cab7197f2acbe0497ce6a8f09c43d8d111f4c1f813549273523ea70f0baf691cd1e8a1097e231608
-DIST stagit-0.9.tar.gz 18580 BLAKE2B 74518c8d08d1f2f507f4a9c4bcd441f65292afcbe5987ba0e31f4776fdf4f9188bbfafda5ac0af0622fd053075dc9d7760df813b3eb20101c4554cf32569c18d SHA512 662daa1942ca444eed1470e2e77af92326e482913f3e6ed5268c31546a51ce28ebc1dffbf5b4a6ceb21e6d00d816380bc6e5eab2eeb00b2ed6beceb6ab5e2f15
+DIST stagit-0.9.4.tar.gz 18912 BLAKE2B 945dd65f2448f96d642054486538bd2537731d36eac238bad5d5dedfeb39e94fbc22d16e2427d0f846d12d344c35cf15a110c9982625671d97ec31a45c345604 SHA512 12ef71123a12a77f5d5c2245ae54f0ed6a97c80f8b97c9654f086eca88ab7945ce599afdb526b2db843becf86d48b018181a5068e09c32bfceefad1d50b98c94
diff --git a/www-apps/stagit/stagit-0.8.ebuild b/www-apps/stagit/stagit-0.8.ebuild
@@ -1,26 +0,0 @@
-# Copyright 2016-2019 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="static git page generator"
-HOMEPAGE="https://git.codemadness.org/stagit/"
-SRC_URI="https://codemadness.org/releases/stagit/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/libgit2:="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -i \
-		-e "s;^PREFIX =.*;PREFIX ?= ${EPREFIX}/usr;" \
-		-e "s;^MANPREFIX = .*;MANPREFIX = ${EPREFIX}/usr/share/man;" \
-		-e "s;^LDFLAGS = -s;LDFLAGS = ;" \
-		"${S}/config.mk" || die
-
-	sed -i "s/#CC =.*/CC ?= ${CC:-cc}/" "${S}/config.mk" || die
-}
diff --git a/www-apps/stagit/stagit-0.9.4.ebuild b/www-apps/stagit/stagit-0.9.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2016-2019 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="static git page generator"
+HOMEPAGE="https://git.codemadness.org/stagit/"
+SRC_URI="https://codemadness.org/releases/stagit/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-libs/libgit2:="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	sed -i \
+		-e "/^.POSIX:/d" \
+		-e "s;^PREFIX =.*;PREFIX ?= ${EPREFIX}/usr;" \
+		-e "s;^MANPREFIX = .*;MANPREFIX = ${EPREFIX}/usr/share/man;" \
+		"${S}/Makefile" || die
+}
diff --git a/www-apps/stagit/stagit-0.9.ebuild b/www-apps/stagit/stagit-0.9.ebuild
@@ -1,26 +0,0 @@
-# Copyright 2016-2019 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="static git page generator"
-HOMEPAGE="https://git.codemadness.org/stagit/"
-SRC_URI="https://codemadness.org/releases/stagit/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/libgit2:="
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -i \
-		-e "s;^PREFIX =.*;PREFIX ?= ${EPREFIX}/usr;" \
-		-e "s;^MANPREFIX = .*;MANPREFIX = ${EPREFIX}/usr/share/man;" \
-		-e "s;^LDFLAGS = -s;LDFLAGS = ;" \
-		"${S}/config.mk" || die
-
-	sed -i "s/#CC =.*/CC ?= ${CC:-cc}/" "${S}/config.mk" || die
-}