Housekeeping

(Portage version: 2.1.2_rc1-r5)
 (Signed Manifest commit)

5 files changed, 16 insertions, 138 deletions

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index ee2f73aeb9a1..59b4dc78fbf2 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -9,54 +9,38 @@ AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0
 MD5 847b42fb080bd720da8854ef46ebcf52 files/conf.d 138
 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c files/conf.d 138
 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c files/conf.d 138
-AUX init.d 411 RMD160 b33545e4be52e69728df0f0a4f2698c58a05ca36 SHA1 e5a05ec2b692983e7eee1882d2e62ea214fe7ed3 SHA256 5a9faa34fe3cc27a012e3c1f86d82de97a7b78db629b303e47908cf7318fc801
-MD5 fc6cb561550067ae70f7596cd82e092a files/init.d 411
-RMD160 b33545e4be52e69728df0f0a4f2698c58a05ca36 files/init.d 411
-SHA256 5a9faa34fe3cc27a012e3c1f86d82de97a7b78db629b303e47908cf7318fc801 files/init.d 411
-AUX postinstall-2.txt 642 RMD160 a9686f5b3bce3d4f5fd27590ac1897a14425856d SHA1 712c015fc6acaa4421866e5ee7a3d6cb7c310f19 SHA256 8998e32db2f1ce5729c0747079cdc103e671c6d5e4ba91eececeb756e204bcaa
-MD5 21ab788b3ccd7e2383eaf04d9d87abec files/postinstall-2.txt 642
-RMD160 a9686f5b3bce3d4f5fd27590ac1897a14425856d files/postinstall-2.txt 642
-SHA256 8998e32db2f1ce5729c0747079cdc103e671c6d5e4ba91eececeb756e204bcaa files/postinstall-2.txt 642
-AUX postinstall.txt 627 RMD160 4684b7099eeb05886fb434b6eaabea6ee405d670 SHA1 2a8d599d2ce253a568fa433cf372a70f47a8af10 SHA256 e61ef4565aba1aee2c472aa38f7feeb7c8acb7db8ba23bd8ec48a4a08129ffba
-MD5 f1bbdbaae143812aebe236c421c4fba9 files/postinstall.txt 627
-RMD160 4684b7099eeb05886fb434b6eaabea6ee405d670 files/postinstall.txt 627
-SHA256 e61ef4565aba1aee2c472aa38f7feeb7c8acb7db8ba23bd8ec48a4a08129ffba files/postinstall.txt 627
+AUX init.d 360 RMD160 64806288a9d6365ac08d007db84e5ec37fbd1dcd SHA1 fa4f08eae4505557e6404c2057fb5a77e7735386 SHA256 cb5fdc937bb0a36f123c07cc043945a2e587e21a98343bb8650029e2a7f469ab
+MD5 a657585dda44bd363d478d472d2e63e2 files/init.d 360
+RMD160 64806288a9d6365ac08d007db84e5ec37fbd1dcd files/init.d 360
+SHA256 cb5fdc937bb0a36f123c07cc043945a2e587e21a98343bb8650029e2a7f469ab files/init.d 360
+AUX postinstall-2.txt 643 RMD160 fb8baf88fe59785c1bd2d9cfd75e2d93d33768d6 SHA1 261ee61072bf84aae66f5679f2f6be4abb6c68be SHA256 755181f71bda2b3763abb660a54952ef36d70f129ba202e814677b7f55c562e2
+MD5 9d4abb5f521e41755f068ef3bc713fe2 files/postinstall-2.txt 643
+RMD160 fb8baf88fe59785c1bd2d9cfd75e2d93d33768d6 files/postinstall-2.txt 643
+SHA256 755181f71bda2b3763abb660a54952ef36d70f129ba202e814677b7f55c562e2 files/postinstall-2.txt 643
 AUX postupgrade.txt 463 RMD160 2ffe191845a0aad2ee2429708d3a55871a246997 SHA1 0b9dd5d9932a09feea6fcb12349f709d77ece725 SHA256 d25b259fe650ba385c6aa4b313a78d829a429d0ba0d15ee2d0acd14d3c4e39eb
 MD5 cfa6cb66424994a2ace6b983a81a9eed files/postupgrade.txt 463
 RMD160 2ffe191845a0aad2ee2429708d3a55871a246997 files/postupgrade.txt 463
 SHA256 d25b259fe650ba385c6aa4b313a78d829a429d0ba0d15ee2d0acd14d3c4e39eb files/postupgrade.txt 463
-AUX zmconfig-gentoo.txt 505 RMD160 771dfbdcdce5f7d709c9a909814e2fbf9eddb6fb SHA1 238637de041c385c7c2e07e9cb452590add993a7 SHA256 5a85e99ec4903271b5b48b6fd0bf4d22a6d7ae5c7ea2d8f1971e726fa5507621
-MD5 8c805069c0e1f5731ba4326e5cc3aec6 files/zmconfig-gentoo.txt 505
-RMD160 771dfbdcdce5f7d709c9a909814e2fbf9eddb6fb files/zmconfig-gentoo.txt 505
-SHA256 5a85e99ec4903271b5b48b6fd0bf4d22a6d7ae5c7ea2d8f1971e726fa5507621 files/zmconfig-gentoo.txt 505
 DIST ZoneMinder-1.22.2.tar.gz 1246851 RMD160 ec84f03e26573a4ab9965c5d365368b78cd9e333 SHA1 917b6734764a192fbdcd6733f46bddc6ef4e33ff SHA256 f8d0ee7e19eb17ff793cd0cc92629919233f1e52e07d5dbc73e02b7a611bd360
-DIST zm-1.21.4.tar.gz 935070 RMD160 233fcd3084e366cdf305d943d9098df7cccf6eb3 SHA1 74d639512d4350c3df0ac6c54ddf1af07fc3fa51 SHA256 e69fb3f9e739adf7e7628ba6de7b0fc8ad4b0a2c879d4a6ca1c104ec7a00722e
-EBUILD zoneminder-1.21.4.ebuild 1706 RMD160 ed1268860f24471e93ce39e4e5158027ceefb94a SHA1 928c3b32ec43d93199cc0d1653e3214231cbbcb9 SHA256 f6853464d5d5674959665e09a5fa9c7a654cadbf2fb69b73e6dd40b913fbeddc
-MD5 38805a5c2234a1b7dd1f0569f5093851 zoneminder-1.21.4.ebuild 1706
-RMD160 ed1268860f24471e93ce39e4e5158027ceefb94a zoneminder-1.21.4.ebuild 1706
-SHA256 f6853464d5d5674959665e09a5fa9c7a654cadbf2fb69b73e6dd40b913fbeddc zoneminder-1.21.4.ebuild 1706
 EBUILD zoneminder-1.22.2.ebuild 2143 RMD160 22fc8e0beddcdf8663517dd5a1c398cd73bf7f76 SHA1 ae346dfe29bc2370eeaf1495f69a01c6b2c92039 SHA256 46a5636065074712b802238e7c5146a26da06d77e0c1d50af2776b4f3f603de5
 MD5 a9ded854e0e657fb402d5b7df19de2a9 zoneminder-1.22.2.ebuild 2143
 RMD160 22fc8e0beddcdf8663517dd5a1c398cd73bf7f76 zoneminder-1.22.2.ebuild 2143
 SHA256 46a5636065074712b802238e7c5146a26da06d77e0c1d50af2776b4f3f603de5 zoneminder-1.22.2.ebuild 2143
-MISC ChangeLog 3295 RMD160 59870fb9084eec123977a74142a0ac1e9ac4b48b SHA1 4b6e770daf284b0c16d887dcd3a830aa9b3cc79e SHA256 7ca11ae4e4d28e104fb307d3af2872cb1eec95b01d5d397fbe7fdc0f27dee92b
-MD5 3c6d2f8d3674da728645aaf1323c45c3 ChangeLog 3295
-RMD160 59870fb9084eec123977a74142a0ac1e9ac4b48b ChangeLog 3295
-SHA256 7ca11ae4e4d28e104fb307d3af2872cb1eec95b01d5d397fbe7fdc0f27dee92b ChangeLog 3295
+MISC ChangeLog 3479 RMD160 e9d4554d71ba7232e4b3ab9f24e5baec808b37eb SHA1 04d7ce2d5206bc36ff7fa5b0305b0521ad665d8f SHA256 8b34d36193da576c93a7962cf6ede4e71021df6422078710612cbf45b2650a0f
+MD5 e9e2491f77f8977bac7fb0e54bd2cc7e ChangeLog 3479
+RMD160 e9d4554d71ba7232e4b3ab9f24e5baec808b37eb ChangeLog 3479
+SHA256 8b34d36193da576c93a7962cf6ede4e71021df6422078710612cbf45b2650a0f ChangeLog 3479
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata.xml 161
-MD5 4917e04864d3089c68d5f9323534c097 files/digest-zoneminder-1.21.4 229
-RMD160 63045b06384deb366623496b5ff14ffb4fc370ac files/digest-zoneminder-1.21.4 229
-SHA256 4dc2718da68e0bbd0a6b0083e387604ce21c6a3fddc5493368bf3cb9008e7292 files/digest-zoneminder-1.21.4 229
 MD5 ef69908feb613e3ecb96f8bed2056645 files/digest-zoneminder-1.22.2 256
 RMD160 47f2521f4bcf82323179e87109e624ca2f15d479 files/digest-zoneminder-1.22.2 256
 SHA256 0d06e592aa18069445ec2176f379064c2d9ffb8f5c0e5944ff9cc35de84ca36d files/digest-zoneminder-1.22.2 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFSSsuEzitwsaoONoRAkQnAJ9zKgemYtqE//8i7RAJExNkO0XtSACgjd1p
-HjvhdjDFYMGYA4SQGTUSDlg=
-=voEI
+iD8DBQFFY39fEzitwsaoONoRAiZOAKCujWUp+CxkByIvJfaJ+15qEmH8jACeIaqV
+MY7vmeJ8KooHLFqSTe7tVl4=
+=Dh9X
 -----END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/files/digest-zoneminder-1.21.4 b/www-misc/zoneminder/files/digest-zoneminder-1.21.4
deleted file mode 100644
index 94c7747253e7..000000000000
--- a/www-misc/zoneminder/files/digest-zoneminder-1.21.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ce35d8f99bf7da0691a692fd6e10005f zm-1.21.4.tar.gz 935070
-RMD160 233fcd3084e366cdf305d943d9098df7cccf6eb3 zm-1.21.4.tar.gz 935070
-SHA256 e69fb3f9e739adf7e7628ba6de7b0fc8ad4b0a2c879d4a6ca1c104ec7a00722e zm-1.21.4.tar.gz 935070
diff --git a/www-misc/zoneminder/files/postinstall.txt b/www-misc/zoneminder/files/postinstall.txt
deleted file mode 100644
index 5bb5c2d66404..000000000000
--- a/www-misc/zoneminder/files/postinstall.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-If this is a new installation, you will need to create a database for ZM to
-use. Execute the following:
-
- cd /usr/share/doc/${PN}-${PVR}
- gunzip zmschema.sql.gz && mysql mysql < zmschema.sql
- mysql mysql
-  > grant select,insert,update,delete on <your database name>.* to '<username>'@localhost identified by '<password>';
-  > quit
- mysqladmin reload
-
-Now run zmconfig.pl:
- cd /usr/share/${PN}-${PVR}
- edit zmconfig-gentoo.txt set your db settings
- ./zmconfig.pl -f ./zmconfig-gentoo.txt -noi -nor
-
-Then edit /etc/zm.conf, and log in:
- http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/zm.php
-
-Default username/password are admin/admin.
diff --git a/www-misc/zoneminder/files/zmconfig-gentoo.txt b/www-misc/zoneminder/files/zmconfig-gentoo.txt
deleted file mode 100644
index a474d4cbe51f..000000000000
--- a/www-misc/zoneminder/files/zmconfig-gentoo.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Name: ZM_PATH_MPEG_ENCODE
-Value: /usr/bin/mpeg_encode
-Description: Path to (optional) Berkeley mpeg encoder
-
-Name: ZM_PATH_FFMPEG
-Value: /usr/bin/ffmpeg
-Description: Path to (optional) ffmpeg mpeg encoder
-
-Name: ZM_OPT_NETPBM
-Value: yes
-Description: Are the (optional) Netpbm utilities installed
-
-Name: ZM_PATH_NETPBM
-Value: /usr/bin
-Description: Path to (optional) Netpbm utilities
-
-Name: ZM_PATH_LOGS
-Value: /var/log/zoneminder
-Description: Path to the various logs that the ZoneMinder daemons generate
diff --git a/www-misc/zoneminder/zoneminder-1.21.4.ebuild b/www-misc/zoneminder/zoneminder-1.21.4.ebuild
deleted file mode 100644
index af04c8b78177..000000000000
--- a/www-misc/zoneminder/zoneminder-1.21.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.21.4.ebuild,v 1.2 2006/02/06 00:17:32 rl03 Exp $
-
-inherit eutils webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system."
-HOMEPAGE="http://www.zoneminder.com/"
-SRC_URI="http://www2.zoneminder.com/downloads/zm-${PV}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="mpeg mysql"
-
-DEPEND="mysql? ( >=dev-db/mysql-3 )
-	>=media-libs/jpeg-6b
-	>=net-www/apache-1.3.27-r3
-	dev-lang/perl"
-
-RDEPEND="mpeg? ( media-video/ffmpeg )
-	virtual/php
-	media-libs/netpbm
-	dev-perl/DBD-mysql"
-
-S=${WORKDIR}/zm-${PV}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-mysql=/usr \
-		--with-webdir=${MY_HTDOCSDIR} \
-		--with-cgidir=${MY_CGIBINDIR} \
-		$(use_with mpeg ffmpeg)=/usr \
-		--with-webuser=apache \
-		--with-webgroup=apache || die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO db/zmschema.sql
-	dohtml README.html
-
-	dodir /usr/share/${P}
-	insinto /usr/share/${P}
-	doins zmconfig.pl ${FILESDIR}/zmconfig-gentoo.txt zmconfig_eml.txt zmconfig_msg.txt
-	fperms 0700 /usr/share/${P}/zmconfig.pl
-
-	dodir /var/log/${PN} && keepdir /var/log/${PN}
-	fowners apache:apache /var/log/${PN}
-
-	fperms 0644 /etc/zm.conf
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall.txt
-	webapp_src_install
-}