GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-17 13:25:45 +02:00
Code Packages

Merge branch 'master' into subvol-threads

Browse Source
This commit is contained in:
Zygo Blaxell 2018-01-11 21:26:34 -05:00
commit 68d48b3d63
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -5,8 +5,7 @@ USRLIB_PREFIX ?= $(USR_PREFIX)/$(LIBDIR)
SYSTEMD_LIB_PREFIX ?= $(PREFIX)/lib/systemd SYSTEMD_LIB_PREFIX ?= $(PREFIX)/lib/systemd
LIBEXEC_PREFIX ?= $(USRLIB_PREFIX)/bees LIBEXEC_PREFIX ?= $(USRLIB_PREFIX)/bees
MARKDOWN := $(firstword $(shell which markdown markdown2 markdown_py 2>/dev/null)) MARKDOWN := $(firstword $(shell which markdown markdown2 markdown_py 2>/dev/null || echo markdown))
MARKDOWN ?= markdown
# allow local configuration to override above variables # allow local configuration to override above variables
-include localconf -include localconf

12
contrib/gentoo/bees-9999.ebuild
View File

@ -12,9 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/kakra/bees.git" EGIT_REPO_URI="https://github.com/kakra/bees.git"
EGIT_BRANCH="integration" EGIT_BRANCH="integration"
else else
IUSE="" SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> bees-${PV}.tar.gz"
fi fi
PATCHES=" PATCHES="
@ -26,12 +24,16 @@ SLOT="0"
KEYWORDS="" KEYWORDS=""
IUSE="" IUSE=""
DEPEND=" COMMON_DEPEND="
>=sys-apps/util-linux-2.30.2 >=sys-apps/util-linux-2.30.2
>=sys-devel/gcc-4.9 >=sys-devel/gcc-4.9
>=sys-fs/btrfs-progs-4.1 >=sys-fs/btrfs-progs-4.1
" "
RDEPEND="${DEPEND}" DEPEND="
${COMMON_DEPEND}
|| ( dev-python/markdown dev-python/markdown2 )
"
RDEPEND="${COMMON_DEPEND}"
DOCS="README.md COPYING" DOCS="README.md COPYING"
HTML_DOCS="README.html" HTML_DOCS="README.html"