summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2016-12-10 21:16:01 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2016-12-10 21:16:01 +0100
commitede15d123b57076216a1068d7a4a8838610d1198 (patch)
tree1483b71fbf535536ab9968d8f9cbc7d3f6eadd76
parentwww-misc/zoneminder: Remove last call to depend.php.eclass; replaced by use deps (diff)
downloaddilfridge-ede15d123b57076216a1068d7a4a8838610d1198.tar.gz
dilfridge-ede15d123b57076216a1068d7a4a8838610d1198.tar.bz2
dilfridge-ede15d123b57076216a1068d7a4a8838610d1198.zip
www-misc/zoneminder: Use releases, not git clones; work around submodule issue
Package-Manager: portage-2.3.2
-rw-r--r--www-misc/zoneminder/Manifest2
-rw-r--r--www-misc/zoneminder/zoneminder-1.30.0.ebuild20
2 files changed, 17 insertions, 5 deletions
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
new file mode 100644
index 0000000..1ceb9cc
--- /dev/null
+++ b/www-misc/zoneminder/Manifest
@@ -0,0 +1,2 @@
+DIST Crud-3.0.10.tar.gz 72960 SHA256 462d05e21d17cc6b11cdc441971d1a7f07688512b5f7903217a574c6c39efd91 SHA512 2f60557f2c783bb448e06c1ca40b536a1d7d5f3caf0626fa6716a28f808492d4799e238f16c022571be96921105b074b6763920fd7b9cc77b76d17ceadae2040 WHIRLPOOL 6c8d78dd30e8373a2b014fe4f6d17a4e2ec1051a6dc09d8b0759c6cd76ae78cb633e2c1eaab125aa29e66903de201337da979b3e412e8861a2431588251d817b
+DIST zoneminder-1.30.0.tar.gz 9757409 SHA256 e7c964c339305f42a044ca8e34fa4e6a33c452fdaf33642458735daf8b864325 SHA512 cbff14447a568648a0475e878be5cd19cb694c65814fe33c20774752410e31f3f4ff9e5695667d4d50634b3193dc50aaca2d950efc151bbb968d3f9609d35db4 WHIRLPOOL af901055bb1ac9ae668fae23f80aff20632d6ee785e0fe5ab6f71f86fe6e1a8ca2e4dae919c1754ac84025f7bc614cc9cea7470209b2a7a35d3b27746eb9a46b
diff --git a/www-misc/zoneminder/zoneminder-1.30.0.ebuild b/www-misc/zoneminder/zoneminder-1.30.0.ebuild
index 33ce6a0..60f3915 100644
--- a/www-misc/zoneminder/zoneminder-1.30.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.30.0.ebuild
@@ -14,15 +14,18 @@
EAPI=6
-inherit perl-functions readme.gentoo-r1 cmake-utils depend.apache flag-o-matic systemd git-r3
+inherit perl-functions readme.gentoo-r1 cmake-utils depend.apache flag-o-matic systemd
MY_PN="ZoneMinder"
+MY_CRUD_VERSION="3.0.10"
+
DESCRIPTION="Capture, analyse, record and monitor any cameras attached to your system"
HOMEPAGE="http://www.zoneminder.com/"
-# SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/ZoneMinder/ZoneMinder.git"
-EGIT_COMMIT="refs/tags/v${PV}"
+SRC_URI="
+ https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/FriendsOfCake/crud/archive/v${MY_CRUD_VERSION}.tar.gz -> Crud-${MY_CRUD_VERSION}.tar.gz
+"
LICENSE="GPL-2"
KEYWORDS="~amd64"
@@ -78,7 +81,7 @@ RDEPEND="${DEPEND}"
# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
need_apache
-# S=${WORKDIR}/${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}-${PV}
PATCHES=(
"${FILESDIR}/${PN}-1.26.5"-automagic.patch
@@ -87,6 +90,13 @@ PATCHES=(
MY_ZM_WEBDIR=/usr/share/zoneminder/www
+src_prepare() {
+ cmake-utils_src_prepare
+
+ rmdir "${S}/web/api/app/Plugin/Crud" || die
+ mv "${WORKDIR}/crud-${MY_CRUD_VERSION}" "${S}/web/api/app/Plugin/Crud" || die
+}
+
src_configure() {
append-cxxflags -D__STDC_CONSTANT_MACROS
perl_set_version