From dd6d8caaa2f73d3db25320f34eb1a2024bc3f683 Mon Sep 17 00:00:00 2001 From: Kai Krakow Date: Thu, 11 Jan 2018 20:55:00 +0100 Subject: [PATCH 1/3] Installation: Remove superfluous cruft from Gentoo ebuild Signed-off-by: Kai Krakow --- contrib/gentoo/bees-9999.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/contrib/gentoo/bees-9999.ebuild b/contrib/gentoo/bees-9999.ebuild index d39b895..05d583b 100644 --- a/contrib/gentoo/bees-9999.ebuild +++ b/contrib/gentoo/bees-9999.ebuild @@ -12,9 +12,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kakra/bees.git" EGIT_BRANCH="integration" else - IUSE="" - - SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> bees-${PV}.tar.gz" + SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi PATCHES=" From 025b14f38f6b8b247d482271efa863b2a0679091 Mon Sep 17 00:00:00 2001 From: Kai Krakow Date: Thu, 11 Jan 2018 20:55:35 +0100 Subject: [PATCH 2/3] Installation: Depend Gentoo ebuild on markdown Signed-off-by: Kai Krakow --- contrib/gentoo/bees-9999.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/gentoo/bees-9999.ebuild b/contrib/gentoo/bees-9999.ebuild index 05d583b..0742ee8 100644 --- a/contrib/gentoo/bees-9999.ebuild +++ b/contrib/gentoo/bees-9999.ebuild @@ -24,12 +24,16 @@ SLOT="0" KEYWORDS="" IUSE="" -DEPEND=" +COMMON_DEPEND=" >=sys-apps/util-linux-2.30.2 >=sys-devel/gcc-4.9 >=sys-fs/btrfs-progs-4.1 " -RDEPEND="${DEPEND}" +DEPEND=" + ${COMMON_DEPEND} + || ( dev-python/markdown dev-python/markdown2 ) +" +RDEPEND="${COMMON_DEPEND}" DOCS="README.md COPYING" HTML_DOCS="README.html" From 6d6aedd8ecc7876a65e744c35b329a53a68dd797 Mon Sep 17 00:00:00 2001 From: Kai Krakow Date: Thu, 11 Jan 2018 21:25:12 +0100 Subject: [PATCH 3/3] Makefile: Fail gracefully if markdown is not installed Previously, MARKDOWN may end up empty. This commit should fix it. Signed-off-by: Kai Krakow --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 363289c..ea2a2da 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,7 @@ USRLIB_PREFIX ?= $(USR_PREFIX)/$(LIBDIR) SYSTEMD_LIB_PREFIX ?= $(PREFIX)/lib/systemd LIBEXEC_PREFIX ?= $(USRLIB_PREFIX)/bees -MARKDOWN := $(firstword $(shell which markdown markdown2 markdown_py 2>/dev/null)) -MARKDOWN ?= markdown +MARKDOWN := $(firstword $(shell which markdown markdown2 markdown_py 2>/dev/null || echo markdown)) # allow local configuration to override above variables -include localconf