Version bump. Fixes in addition bugs 519752, 523056, 523058

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 171 insertions, 17 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index fb9d150dddbc..6664d0800111 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/zoneminder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.44 2014/04/26 20:02:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.45 2014/11/06 21:23:51 dilfridge Exp $
+
+*zoneminder-1.28.0 (06 Nov 2014)
+
+  06 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +zoneminder-1.28.0.ebuild:
+  Version bump. Fixes in addition bugs 519752, 523056, 523058
 
   26 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   zoneminder-1.27.0.ebuild, metadata.xml:
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index f249aa97ba05..86223b77b934 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -8,25 +8,27 @@ AUX init.d 524 SHA256 2ff38c2f716661eda982f17b0ebb2dbf483c8b68a8c35154e3e6db76fa
 AUX zoneminder-1.24.2-db_upgrade_script_location.patch 412 SHA256 3ffaa44c013dd27c3e5e937de77158c60b4cd37f28e1fc42dd7283f80075b067 SHA512 c215b7bfc3bb500a5483c91a0532b350e1b70d31949e223163c709bc211133f3f4bfa3e499104fc1b6e70c229e8469dc37a2ae40365084e27ffa2b71c0ce1ce4 WHIRLPOOL ecc433d1d52f88f4c6eebe46caff28f456aad71aece47f76f3adee2d57275ed9b2c30400bb931c6c27cbd4614e9de8573a8eb5bffc73d08e566b04a1d2c420f1
 AUX zoneminder-1.26.5-automagic.patch 1064 SHA256 44b88912f3f98b7e9eddeb78890bef3dffe44c7475ebd3b7ec70354db4f0f33f SHA512 3bd257233d7b5a376418fed1285bd82aa69e83461251bd941a756acbf87189e23fe3b82c56105d12b90fd5d294ce9708dc8895440fc0f154f4590385fa42e657 WHIRLPOOL 3f495ada57e73d918784eb17bddd770898c1aa4f13294b600b5740b3d6fd5a1113a984b2c3de92cf2790ff1bba23ecd7646f36716951701fdb461bfb0e70de7c
 DIST zoneminder-1.27.0.tar.gz 1262653 SHA256 2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2 SHA512 8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14 WHIRLPOOL 869811e289e11343ff0cd0bd078a477db3511ed3cc96574d71163e1ab9eaf703e26f7c526841164a41f8d1e1aae47eb7f198831999b0c39f2729199fe81f43c0
+DIST zoneminder-1.28.0.tar.gz 2804199 SHA256 b9ee65635753e094dcad6cdb480acc42bff8b8f023ee008790883a4308273ca2 SHA512 ac2a036adac436d76db8bb0b161d063111cc7cc7f6bcb9ca1b46862cfb0285b291926df716df645c0be47b7465bbbf3b1050c85529ff5068bdcc34f1c8ba6df1 WHIRLPOOL 012a088ab6411cf7a1ec1e0c4d9c9f1e61889c3729ea736baafb5174a20f61a82c280b7c5bfd669e031b3e1844abe1de0a577e73f82295b080d88b4ae43b627b
 EBUILD zoneminder-1.27.0.ebuild 3437 SHA256 4efc8523dede05c1ad7bb03232183ec5469ec4616cc58915e2c4c8706972d1d8 SHA512 7ca025e7b4d5da1528df486fa0a0670226c1a4b08e02b1cb6906abb23c2fc115da35e6b70a28e318a2a6d683237909c63af97544df838617f1454b41d5efd826 WHIRLPOOL 2ac308cd2d56c731ecfa811d0105da3e3f20b5af70d959ccf813b6018db7255e306ba6903c8b336ff63799ffb0a1517f8b80379714733405ef811bf16dc49951
-MISC ChangeLog 736 SHA256 a0b602082105bedaa3e3b3b7a04a715706628361268493c09cf2e6540dfd2506 SHA512 4ef4bc96876d8f00066858451a96af4b40ff63c72f9d0c7ebe6dbadbe690be6ab8972f500a9ee1aa8bc9b8fe92a4c2162b2e3638982b1ff308bd73640e045723 WHIRLPOOL f523729ca3fd339aea70dbad4135da2f1833b870bf10c442c255b25bef423037e21079659331a63fbb0012e0795d8ba801127e15c4a575fb9f364df5aafabad3
+EBUILD zoneminder-1.28.0.ebuild 3811 SHA256 7fb6f7fa5fe39ad368423ea820e1471936b74197f8ebf2b842b470fb340e19c4 SHA512 b5593638214ee9c7d1803ae81c4440fadc75eb8c1c691cc6c4af1241ef0b80a679302d51bc604414c3908b98bae0ab9754eb2b6e55036721781e0f492c0606fb WHIRLPOOL e2dc6d3b2ac15d191aae891777968b04c0f50bc250c863a232ff1065da0dcdaacd37244ee168516e15c544b13c49f70b2da62fd7075e43b8880a5f18510e2a03
+MISC ChangeLog 919 SHA256 71bf8a442c0aba7753e919bf1689cb9a33dd125c4b7feeb8fe03d8350898a7ec SHA512 58af2b9a701ea56b0a844b5ee98fc5869a3e492a5b0cb93c86ff2fbe7b602133996ffaccff3076e67c209534ad12d578ccdeec4ea7b3199011790992fd032a75 WHIRLPOOL 88a65b4f60e86098b742ec00eb509d87ef95576a5e575cb979697e9d2e0d40b57b7f331f08e748ce55ee104b7a608e0ce3ac59e8c5332399562007aaaba9256b
 MISC metadata.xml 484 SHA256 ca9c7ba233e6079027e4b8a5f8411b4ef4c95ba47bf8acb89a771bfcba415848 SHA512 145235acdfd2c6cc8c11e638340a187cf2cd016fbf5c8c2cd1e58913112777b7f787a950725ca5b734dbe30433d4523826b6e2014bd41cb72b05dbdcb2cb5dc5 WHIRLPOOL b7280d1c00a304f2d540e6da810765df8a096355021b89eac799afdbf557b755081cebe0049ef0eb7f8ba25a7bab286cbb40151f58fec1f216dbe953fc65c581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTXBDFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUW+boXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOctZQQANnuOQe05HPN5/Fotw51WnXd
-zDKvccSbhIChzU3SHspIEAHjzFEgw5rE9gwTytNxPCf05EKDQ3mlCzaymmXh5Hg2
-3Nzg0BX7ob9FSlJgYblzNmUgithQvOW1Hck95iZrEk7AZ/XpYytLAIexulkzxblK
-JwlYjFIdcVPfsaUFPQP+VCDho/UA3VaN6LXfKvtYWKUYMto52h1WXEEDZZN7c3A/
-njCHx3LvQYKOAX75Jio/MHju4gbo3qLg8W6M4CtfobQuJ90jn7NPAWTBenhTFJXZ
-oHcU/DYFwf+jiXnrB65s7lnAbEvJCh+mc2tMeFNKAj6gYdSmSL+oHwCV/tceumPK
-vgcP5TMQNJ8aTaSHquIjfu/n6FRiM2vVTrbL0pQfEFRYc+ezq8/iuuT/M7FrZyhu
-JbiYqtqcPxU4DOUB7KAB4DLvHVfJ8eQfdHC/prpSN6gkdC9a2YwLMHpGoH9GuEcN
-Q7nDeo3PxTMOJAX0ULnvSbc5j+JtZFO2/MQ8u5mqQ6aHDNAHm4wPxkteJtCtjOdt
-9srLi+pGaIEEZ7iBcz0gPDZLIZTf2Y63juQWWd0ba3ktVTB6VUWWwxwjy3Emo4y6
-HE6oGYcitpA7qeT63mBh4qzYE9rYDc76W+QYyLzs/fJ3tL6qNM4ridupYQoEy+gb
-/T81/H7JKLAiVHrToYQL
-=Nh6b
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcYxEP/An7SdcdtXA2Y5LxEv8AgwQG
+UGRtV1GYI1OkTXY85NhbxwMPclFB5Eh1ZySjuewfpzfrP0XRLsPEUMOMvyLiSmMh
+BKQHCeVm4OjGSF3eLhN0Zu80OuZIFpcrbl6XGYgIAVnKx6hiQps5fm4ZdN5BvW6V
+EVAvG9pxRGB5j4T79LoiymWWqutvimSWaLwwj3l8iD8sN0L2gDR5nfApCa9AoSv2
+W6PJ7U6+6M6ZSeCUmVhukIkf9tZ7n3jYqYYCWYLAYx7TGQ10ZMzBjU8eO4yrVm6+
+9nWbwEVgOV6BtRrrZiSFfmpD/fxKXiGAJ8X0jNQhilaw/wh3FFFW7hUXUMs6L6EA
+rhnjQAOrzJhQwJFQ0OykOdDAdNn+TwPvhDl8vCogBIQfQGD00kb8AnyombYxp/BS
++xL4wL1TrXrj7lH11ODDXarr4sKwCycHBQR144sSVQg3GolQkYlMOMLd4tQoxEue
+NQLD7oYSbiT5eXAZh2A9jkObdFcA+uAwYl0sXRXUY9TQ9kzbcVs2jcxThv2aq/Wm
+KBW/ftESeqVeh/jJrJ0lAAotnKJNoX0l5fR6uGUpt3V+fDr5OwqDQYHE2jhPZwRb
+WyHKj1wOLlSo4d1cwkSGMnJgVBFclV5hkyq1G3MjxMtBCsPJVqualfWU0ta6t4ou
+4+QrysZ8E8o233f8dpDs
+=xrF2
 -----END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/zoneminder-1.28.0.ebuild b/www-misc/zoneminder/zoneminder-1.28.0.ebuild
new file mode 100644
index 000000000000..6d400e52d3b7
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.28.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.28.0.ebuild,v 1.1 2014/11/06 21:23:51 dilfridge Exp $
+
+# TO DO:
+# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then 
+#		$(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+# * dependencies of unknown status:
+# 	dev-perl/Archive-Zip
+# 	dev-perl/Device-SerialPort
+# 	dev-perl/MIME-Lite
+# 	dev-perl/MIME-tools
+# 	dev-perl/PHP-Serialization
+# 	virtual/perl-Archive-Tar
+# 	virtual/perl-libnet
+# 	virtual/perl-Module-Load
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+
+inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+
+MY_PN="ZoneMinder"
+
+DESCRIPTION="ZoneMinder allows you to 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"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="curl gcrypt gnutls +mmap +openssl vlc"
+SLOT="0"
+
+REQUIRED_USE="
+	|| ( openssl gnutls )
+"
+
+DEPEND="
+	dev-lang/perl:=
+	dev-libs/libpcre
+	dev-perl/Archive-Zip
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/URI-Encode
+	dev-perl/libwww-perl
+	sys-auth/polkit
+	sys-libs/zlib
+	virtual/ffmpeg
+	virtual/jpeg
+	virtual/mysql
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Getopt-Long
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+	curl? ( net-misc/curl )
+	gcrypt? ( dev-libs/libgcrypt )
+	gnutls? ( net-libs/gnutls )
+	mmap? ( dev-perl/Sys-Mmap )
+	openssl? ( dev-libs/openssl )
+	vlc? ( media-video/vlc[live] )
+"
+RDEPEND="${DEPEND}"
+
+# we cannot use need_httpd_cgi here, since we need to setup permissions for the
+# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
+need_apache
+need_php_httpd
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
+)
+
+MY_ZM_WEBDIR=/usr/share/zoneminder/www
+
+pkg_setup() {
+	require_php_with_use mysql sockets apache2
+}
+
+src_configure() {
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+	perl_set_version
+
+	mycmakeargs=(
+		-DZM_PERL_SUBPREFIX=${VENDOR_LIB#/usr}
+		-DZM_TMPDIR=/var/tmp/zm
+		-DZM_SOCKDIR=/var/run/zm
+		-DZM_WEB_USER=apache
+		-DZM_WEB_GROUP=apache
+		-DZM_WEBDIR=${MY_ZM_WEBDIR}
+		$(cmake-utils_useno mmap ZM_NO_MMAP)
+		-DZM_NO_X10=OFF
+		-DZM_NO_FFMPEG=OFF
+		$(cmake-utils_useno curl ZM_NO_CURL)
+		$(cmake-utils_useno vlc ZM_NO_LIBVLC)
+		$(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
+		$(cmake-utils_use_has gnutls)
+		$(cmake-utils_use_has gcrypt)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# the log directory
+	keepdir /var/log/zm
+	fowners apache:apache /var/log/zm
+
+	# now we duplicate the work of zmlinkcontent.sh
+	dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
+	fperms -R 0775 /var/lib/zoneminder
+	fowners -R apache:apache /var/lib/zoneminder
+	dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
+	dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
+
+	# bug 523058
+	keepdir ${MY_ZM_WEBDIR}/temp
+	fowners -R apache:apache ${MY_ZM_WEBDIR}/temp
+
+	# the configuration file
+	fperms 0640 /etc/zm.conf
+	fowners root:apache /etc/zm.conf
+
+	# init scripts etc
+	newinitd "${FILESDIR}"/init.d zoneminder
+	newconfd "${FILESDIR}"/conf.d zoneminder
+
+	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
+	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
+
+	perl_delete_packlist
+
+	readme.gentoo_src_install
+}
+
+pkg_postinst() {
+	local myold=${REPLACING_VERSIONS}
+	[ "${myold}" = ${PV} ] || elog "You have upgraded zoneminder and may have to upgrade your database now."
+}