Cleaned the problematic zoneminder ebuilds and fixed bug #222079.

Package-Manager: portage-2.1.4.4

10 files changed, 14 insertions, 331 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 78f4fe008edc..6586f7c05c15 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/zoneminder
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.25 2008/05/06 10:00:23 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.26 2008/05/17 07:40:13 wrobel Exp $
+
+  17 May 2008; wrobel@gentoo.org -files/postinstall-2.txt,
+  -files/Makefile.am.patch, -files/ffmpeg.patch, -files/postupgrade.txt,
+  -files/zm_create.sql.in.diff, -zoneminder-1.22.3.ebuild,
+  -zoneminder-1.23.1.ebuild, zoneminder-1.23.3.ebuild:
+  Cleaned the problematic zoneminder ebuilds and fixed bug #222079.
 
 *zoneminder-1.23.3 (06 May 2008)
 
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index f09006e5904b..abb78eb87cb1 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -6,25 +6,16 @@ AUX 1.23.1/zm_create.sql.in.patch 19013 RMD160 076dbeb30a4758e4ff708139e40302d6d
 AUX 1.23.1/zm_mpeg_ofc.patch 381 RMD160 cd7be2d702f4df9c425142fdaec393c1517dff1c SHA1 40f2639e8a90f068dae9d4ec1ecd64ab980c2d8d SHA256 1af8db1736a373ea38ff7ece376e37233c28aee3925b93fd72991979e71ba3eb
 AUX 1.23.1/zm_remote_camera.patch 1551 RMD160 03024108ba012b7e39620ed950b96df1c4ab63f3 SHA1 cfda28aa3a17c8dda9d5e7dc014dda6a81b5a0a1 SHA256 fdce259c8bbe18bde09c99c270e8615531f4340db98eb28461177b2b305ed097
 AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f
-AUX Makefile.am.patch 833 RMD160 599a72ad1f14a8ee8950c8646e67d2cf40b17002 SHA1 61c6156e3c640321565765a4e0034c0587f25ef8 SHA256 8a40bddee62cf52ad354e61258a98357c6b9246d9cd75cf8acd7132a02770aad
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
-AUX ffmpeg.patch 314 RMD160 a44b49741362f26770fceea62b93a7fceecb0a6b SHA1 3b935d8530b61fabb5e0411f89911f346ae99161 SHA256 0b404f229edb18a120becf20506c7564d292669ee2478ec407f817c2cd3fc326
 AUX init.d 360 RMD160 64806288a9d6365ac08d007db84e5ec37fbd1dcd SHA1 fa4f08eae4505557e6404c2057fb5a77e7735386 SHA256 cb5fdc937bb0a36f123c07cc043945a2e587e21a98343bb8650029e2a7f469ab
-AUX postinstall-2.txt 643 RMD160 fb8baf88fe59785c1bd2d9cfd75e2d93d33768d6 SHA1 261ee61072bf84aae66f5679f2f6be4abb6c68be SHA256 755181f71bda2b3763abb660a54952ef36d70f129ba202e814677b7f55c562e2
-AUX postupgrade.txt 463 RMD160 2ffe191845a0aad2ee2429708d3a55871a246997 SHA1 0b9dd5d9932a09feea6fcb12349f709d77ece725 SHA256 d25b259fe650ba385c6aa4b313a78d829a429d0ba0d15ee2d0acd14d3c4e39eb
-AUX zm_create.sql.in.diff 18897 RMD160 bb7dea7b31d81e43da7307a7fe2420bd69c7e90e SHA1 c7e1dfe00ca5c94bf45bb4484aa5f094ae7fa62d SHA256 eaa9cfd549f4ff678b934d77a6e43922b028627416bb2a066b30630f93f6e76b
-DIST ZoneMinder-1.22.3.tar.gz 1258311 RMD160 0752e77333d3eb2f320bb692905eeec9ae7a311e SHA1 4e86dee31acc5f080c8a6f8ce29228b450067201 SHA256 6bee02be8d5e21d3435c17def157a87727330ee6480be3a8fa5b1966cc10a6bc
-DIST ZoneMinder-1.23.1.tar.gz 744316 RMD160 20f6ce258d1e8054aada57baecdfeb948593ee09 SHA1 29d15d32e76e68fd07de465daaa27fb540084799 SHA256 185ca8aa2e809af8ac55f055c7e58b619a0eb37bd463a8693b76f7a40a439bf8
 DIST ZoneMinder-1.23.3.tar.gz 764528 RMD160 cf04dcd61891a5b8b1a30d738a8b1274ecefad70 SHA1 aaca4fb26b2f09d57b1901f49c538d7e46963254 SHA256 76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
-EBUILD zoneminder-1.22.3.ebuild 2538 RMD160 0b34a0bdf59127f65a3693b7813e85dff495f143 SHA1 fcc1266de1f5ed711b3f25c639e6a31c38215ecd SHA256 4be442c4e1fa66172504f9ef5c29b3285ba2409208cb22a925c063d743f5391f
-EBUILD zoneminder-1.23.1.ebuild 2763 RMD160 2edea45d3a7451b2d2d1bd6215fa7024eec028bc SHA1 a3647c171fa51f6d79e5911834333e1a6f8ffb9d SHA256 999e453d4716b13e691538e328ffd9e4588bce3bedfdcf084e8dbbf889677c17
-EBUILD zoneminder-1.23.3.ebuild 3520 RMD160 f788eae6c73f47a4db4f54429b00b6662277c8b1 SHA1 bfac77d638e5711d797076ee498e57c8bc6265a9 SHA256 4cbd97d7ff780604cf4a50af39b9fc073bf36ddd556ebfb43bce8aeb10d529df
-MISC ChangeLog 4691 RMD160 5631d01b6313f78820c16838f0e6d20654cbec1b SHA1 c5a2b80f2e69488fc5989c1c76a8ffc149a0acbb SHA256 3a7c277aeb96217ee1fa4a78d107eeb8be744a3d0852000f7e28b494170c5744
+EBUILD zoneminder-1.23.3.ebuild 3536 RMD160 f782863fba24cdb52242aadad0c7937b931a861b SHA1 ee30a1a121614feb246291d482f59ad786984609 SHA256 d375988802790394bb1d9216d9f92194fe6c89efcb550d99185f45dcada26b1d
+MISC ChangeLog 5006 RMD160 7f1d0ac24735f7cb20236b938af1736cd743301b SHA1 74fe6cbe148d86600872b025a4d653f1280f866b SHA256 ec7f1ed2897148672303ff88a9bc4e78fdfc77f6fb479f700162c0dd885efd58
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFIICxJEEcxCpcDQ74RAlMgAJ9jH1yq33jfr0LJQptpkL1jF6YDqACfVCO9
-L1aZhsMfV0F/8m1rIpVctIk=
-=+cGP
+iD8DBQFILowCEEcxCpcDQ74RAqn7AJ9Qra/jDjVOyf1usr5QHX06ygHQsgCeJAX0
+UeVi0nfxRNufs5iLhxMhnPA=
+=Y669
 -----END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/files/Makefile.am.patch b/www-misc/zoneminder/files/Makefile.am.patch
deleted file mode 100644
index f8fe519889a5..000000000000
--- a/www-misc/zoneminder/files/Makefile.am.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.am	2005-12-21 06:59:46.000000000 -0500
-+++ Makefile.am.patched	2006-01-17 09:28:15.000000000 -0500
-@@ -22,8 +22,8 @@ EXTRA_DIST = \
- # Yes, you are correct. This is a HACK!
- install-data-hook:
- 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
--	-( if ! test -e $(RUNDIR); then mkdir $(RUNDIR); fi )
--	( if ! test -e $(ZM_RUNDIR); then mkdir $(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR) )
-+	-( if ! test -e $(DESTDIR)$(RUNDIR); then mkdir $(DESTDIR)$(RUNDIR); fi )
-+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir $(DESTDIR)$(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR) )
- 
- uninstall-hook:
- 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
diff --git a/www-misc/zoneminder/files/ffmpeg.patch b/www-misc/zoneminder/files/ffmpeg.patch
deleted file mode 100644
index 75750c72dae7..000000000000
--- a/www-misc/zoneminder/files/ffmpeg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/zm_mpeg.h.orig	2007-04-17 02:31:07.000000000 +0100
-+++ src/zm_mpeg.h	2007-04-17 02:32:01.000000000 +0100
-@@ -24,7 +24,10 @@
- #ifndef ZM_MPEG_H
- #define ZM_MPEG_H
- 
-+extern "C" {
-+#define __STDC_CONSTANT_MACROS
- #include <ffmpeg/avformat.h>
-+}
- 
- #if FFMPEG_VERSION_INT == 0x000408
- #define ZM_FFMPEG_048	1
diff --git a/www-misc/zoneminder/files/postinstall-2.txt b/www-misc/zoneminder/files/postinstall-2.txt
deleted file mode 100644
index 631cd2a03a60..000000000000
--- a/www-misc/zoneminder/files/postinstall-2.txt
+++ /dev/null
@@ -1,23 +0,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/${PN}
- mysql mysql < db/zm_create.sql
- mysql mysql
-  > grant select,insert,update,delete on zm.* to '<username>'@localhost identified by '<password>';
-  > quit
- mysqladmin reload
-
-1.  Edit /etc/zm.conf:
-  ZM_PATH_BUILD => /usr/share/${PN}
-  ZM_PATH_WEB   => ${MY_INSTALLDIR}
-  ZM_PATH_CGI   => ${VHOST_CGIBINDIR}
-
-  Also set your database settings.
-
-2.  Start the zoneminder daemon:
-  /etc/init.d/zoneminder start
-
-3. Login: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/zm.php
-
-Default username/password are admin/admin.
diff --git a/www-misc/zoneminder/files/postupgrade.txt b/www-misc/zoneminder/files/postupgrade.txt
deleted file mode 100644
index 98e59576deed..000000000000
--- a/www-misc/zoneminder/files/postupgrade.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-0. If you are upgrading, you will need to run the zmupdate.pl script:
-
-  /usr/bin/zmupdate.pl version=<from version> [--user=<database user> --pass=<database password>]
-
-1.  Edit /etc/zm.conf:
-  ZM_PATH_BUILD => /usr/share/${PN}
-  ZM_PATH_WEB   => ${MY_INSTALLDIR}
-  ZM_PATH_CGI   => ${VHOST_CGIBINDIR}
-
-  Also set your database settings.
-
-2.  Start the zoneminder daemon:
-  /etc/init.d/zoneminder start
-
-3. Login: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/zm.php
diff --git a/www-misc/zoneminder/files/zm_create.sql.in.diff b/www-misc/zoneminder/files/zm_create.sql.in.diff
deleted file mode 100644
index 1dbe2213393f..000000000000
--- a/www-misc/zoneminder/files/zm_create.sql.in.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- db/zm_create.sql.in.old	2006-05-25 16:55:53.000000000 +0200
-+++ db/zm_create.sql.in	2006-11-12 12:53:56.000000000 +0100
-@@ -552,21 +552,21 @@
- insert into Config set Id = 32, Name = 'ZM_HTTP_UA', Value = 'ZoneMinder', Type = 'string', DefaultValue = 'ZoneMinder', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'The user agent that ZoneMinder uses to identify itself', Help = 'When ZoneMinder communicates with remote cameras it will identify itself using this string and it\'s version number. This is normally sufficient, however if a particular cameras expects only to communicate with certain browsers then this can be changed to a different string identifying ZoneMinder as Internet Explorer or Netscape etc.', Category = 'network', Readonly = '0', Requires = 'ZM_OPT_REMOTE_CAMERAS=1';
- insert into Config set Id = 33, Name = 'ZM_HTTP_TIMEOUT', Value = '2500', Type = 'integer', DefaultValue = '2500', Hint = 'integer', Pattern = '(?-xism:^(\d+)$)', Format = ' $1 ', Prompt = 'How long ZoneMinder waits before giving up on images (milliseconds)', Help = 'When retrieving remote images ZoneMinder will wait for this length of time before deciding that an image is not going to arrive and taking steps to retry. This timeout is in milliseconds (1000 per second) and will apply to each part of an image if it is not sent in one whole chunk.', Category = 'network', Readonly = '0', Requires = 'ZM_OPT_REMOTE_CAMERAS=1';
- insert into Config set Id = 34, Name = 'ZM_OPT_MPEG', Value = 'no', Type = 'string', DefaultValue = 'no', Hint = 'no|mpeg_encode|ffmpeg', Pattern = '(?i-xsm:^([nmf]))', Format = ' $1 =~ /^n/ ? \"no\" : ( $1 =~ /^m/ ? \"mpeg_encode\" : \"ffmpeg\") ', Prompt = 'Is there an (optional) mpeg video encoder installed', Help = 'ZoneMinder can optionally encode a series of video images into an MPEG encoded file. This option allows you to specifiy whether you have an mpeg encoder installed and if so which one. The two that ZoneMinder supports are mpeg_encode and ffmpeg, of which the latter is by far the fastest. However creating MPEG files can be fairly CPU and disk intensive and is not required as events can still be reviewed as video stream without it.', Category = 'images', Readonly = '0', Requires = '';
--insert into Config set Id = 35, Name = 'ZM_PATH_MPEG_ENCODE', Value = '/usr/local/bin/mpeg_encode', Type = 'string', DefaultValue = '/usr/local/bin/mpeg_encode', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to (optional) Berkeley mpeg encoder', Help = 'This path should point to where the Berkeley mpeg_encode program has been installed.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_MPEG=mpeg_encode';
--insert into Config set Id = 36, Name = 'ZM_PATH_FFMPEG', Value = '/usr/local/bin/ffmpeg', Type = 'string', DefaultValue = '/usr/local/bin/ffmpeg', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to (optional) ffmpeg mpeg encoder', Help = 'This path should point to where the ffmpeg has been installed.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_MPEG=ffmpeg';
-+insert into Config set Id = 35, Name = 'ZM_PATH_MPEG_ENCODE', Value = '/usr/bin/mpeg_encode', Type = 'string', DefaultValue = '/usr/local/bin/mpeg_encode', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to (optional) Berkeley mpeg encoder', Help = 'This path should point to where the Berkeley mpeg_encode program has been installed.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_MPEG=mpeg_encode';
-+insert into Config set Id = 36, Name = 'ZM_PATH_FFMPEG', Value = '/usr/bin/ffmpeg', Type = 'string', DefaultValue = '/usr/local/bin/ffmpeg', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to (optional) ffmpeg mpeg encoder', Help = 'This path should point to where the ffmpeg has been installed.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_MPEG=ffmpeg';
- insert into Config set Id = 37, Name = 'ZM_FFMPEG_INPUT_OPTIONS', Value = '', Type = 'string', DefaultValue = '', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Additional input options to ffmpeg', Help = 'Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the input to ffmpeg (options that are given before the -i option). Check the ffmpeg documentation for a full list of options which may be used here.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_MPEG=ffmpeg';
- insert into Config set Id = 38, Name = 'ZM_FFMPEG_OUTPUT_OPTIONS', Value = '-r 25', Type = 'string', DefaultValue = '-r 25', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Additional output options to ffmpeg', Help = 'Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the output from ffmpeg (options that are given after the -i option). Check the ffmpeg documentation for a full list of options which may be used here. The most common one will often be to force an output frame rate supported by the video encoder.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_MPEG=ffmpeg';
- insert into Config set Id = 39, Name = 'ZM_FFMPEG_FORMATS', Value = 'mpg* mpeg wmv avi mov 3gp**', Type = 'string', DefaultValue = 'mpg* mpeg wmv avi mov 3gp**', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Formats to allow for ffmpeg video generation', Help = 'Ffmpeg can generate video in many different formats. This option allows you to list the ones you want to be able to select. As new formats are supported by ffmpeg you can add them here and be able to use them immediately. Adding a \'*\' after a format indicates that this will be the default format used for web video, adding \'**\' defines the default format for phone video.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_MPEG=ffmpeg';
--insert into Config set Id = 40, Name = 'ZM_OPT_NETPBM', Value = '0', Type = 'boolean', DefaultValue = 'no', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Are the (optional) Netpbm utilities installed', Help = 'For low bandwidth situations ZoneMinder will resize images into thumbnails on the fly before sending them to the browser to reduce the network traffic at the expense of CPU on the server. It uses the Netpbm package to do this and this option should be set to where the binaries from that package are installed. If you do not have it installed it means that the images will always be sent full size and rescaled on your browser which may or not be an issue for you.', Category = 'images', Readonly = '0', Requires = '';
-+insert into Config set Id = 40, Name = 'ZM_OPT_NETPBM', Value = '1', Type = 'boolean', DefaultValue = 'no', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Are the (optional) Netpbm utilities installed', Help = 'For low bandwidth situations ZoneMinder will resize images into thumbnails on the fly before sending them to the browser to reduce the network traffic at the expense of CPU on the server. It uses the Netpbm package to do this and this option should be set to where the binaries from that package are installed. If you do not have it installed it means that the images will always be sent full size and rescaled on your browser which may or not be an issue for you.', Category = 'images', Readonly = '0', Requires = '';
- insert into Config set Id = 41, Name = 'ZM_PATH_NETPBM', Value = '/usr/bin', Type = 'string', DefaultValue = '/usr/bin', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to (optional) Netpbm utilities', Help = 'For low bandwidth situations ZoneMinder will resize images into thumbnails on the fly before sending them to the browser to reduce the network traffic at the expense of CPU on the server. It uses the Netpbm package to do this and this option should be set to where the binaries from that package are installed. If you do not have it installed it means that the images will always be sent full size and rescaled on your browser which may or not be an issue for you.', Category = 'images', Readonly = '0', Requires = 'ZM_OPT_NETPBM=1';
- insert into Config set Id = 42, Name = 'ZM_RECORD_EVENT_STATS', Value = '1', Type = 'boolean', DefaultValue = 'yes', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Record event statistical information, switch off if too slow', Help = 'This version of ZoneMinder records detailed information about events in the Stats table. This can help in profiling what the optimum settings are for Zones though this is tricky at present. However in future releases this will be done more easily and intuitively, especially with a large sample of events. The default option of \'yes\' allows this information to be collected now in readiness for this but if you are concerned about performance you can switch this off in which case no Stats information will be saved.', Category = 'debug', Readonly = '0', Requires = '';
- insert into Config set Id = 43, Name = 'ZM_RECORD_DIAG_IMAGES', Value = '0', Type = 'boolean', DefaultValue = 'no', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Record intermediate alarm diagnostic images, can be very slow', Help = 'In addition to recording event statistics you can also record the intermediate diagnostic images that display the results of the various checks and processing that occur when trying to determine if an alarm event has taken place. There are several of these images generated for each frame and zone for each alarm or alert frame so this can have a massive impact on performance. Only switch this setting on for debug or analysis purposes and remember to switch it off again once no longer required.', Category = 'debug', Readonly = '0', Requires = '';
- insert into Config set Id = 44, Name = 'ZM_EXTRA_DEBUG', Value = '0', Type = 'boolean', DefaultValue = 'no', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Whether to switch additional debugging on', Help = 'ZoneMinder binary components usually have several levels of debug information they can output. Normally this is set to a fairly low level to avoid filling logs too quickly. This options lets you switch on other options that allow you to configure additional debug information to be output. Components will pick up this instruction when they are restarted.', Category = 'debug', Readonly = '0', Requires = '';
- insert into Config set Id = 45, Name = 'ZM_EXTRA_DEBUG_TARGET', Value = '', Type = 'string', DefaultValue = '', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'What components should have extra debug enabled', Help = 'There are three scopes of debug available. Leaving this option blank means that all components will use extra debug (not recommended). Setting this option to \'_<component>\', e.g. _zmc, will limit extra debug to that component only. Setting this option to \'_<component>_<identity>\', e.g. \'_zmc_m1\' will limit extra debug to that instance of the component only. This is ordinarily what you probably want to do.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
- insert into Config set Id = 46, Name = 'ZM_EXTRA_DEBUG_LEVEL', Value = '0', Type = 'integer', DefaultValue = '0', Hint = '0|1|2|3|4|5|6|7|8|9', Pattern = '(?-xism:^(\d+)$)', Format = ' $1 ', Prompt = 'What level of extra debug should be enabled', Help = 'There are 9 levels of debug available, with higher numbers being more debug and level 0 being no debug. However not all levels are used by all components. Also if there is debug at a high level it is usually likely to be output at such a volume that it may obstruct normal operation. For this reason you should set the level carefully and cautiously until the degree of debug you wish to see is present.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
--insert into Config set Id = 47, Name = 'ZM_EXTRA_DEBUG_LOG', Value = '/tmp/zm_debug.log+', Type = 'string', DefaultValue = '/tmp/zm_debug.log+', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Where extra debug is output to', Help = 'Depending on your system configuration you may find that only errors, warning and informational messages are logged to your system log. This option allows you to specify an additional target for these messages and debug. This also has the advantage of partitioning debug for the component you are tracing, from messages from other components. Be warned however that if this is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a \'+\' to the filename will cause the file to be created with a \'.<pid>\' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
--insert into Config set Id = 48, Name = 'ZM_PATH_SOCKS', Value = '/tmp', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various Unix domain socket files that ZoneMinder uses', Help = 'ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option where those socket files go.', Category = 'paths', Readonly = '0', Requires = '';
--insert into Config set Id = 49, Name = 'ZM_PATH_LOGS', Value = '/tmp', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various logs that the ZoneMinder daemons generate', Help = 'There are various daemons that are used by ZoneMinder to perform various tasks. Most generate helpful log files and this is where they go. They can be deleted if not required for debugging.', Category = 'paths', Readonly = '0', Requires = '';
-+insert into Config set Id = 47, Name = 'ZM_EXTRA_DEBUG_LOG', Value = '/var/log/zoneminder/zm_debug.log+', Type = 'string', DefaultValue = '/tmp/zm_debug.log+', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'Where extra debug is output to', Help = 'Depending on your system configuration you may find that only errors, warning and informational messages are logged to your system log. This option allows you to specify an additional target for these messages and debug. This also has the advantage of partitioning debug for the component you are tracing, from messages from other components. Be warned however that if this is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a \'+\' to the filename will cause the file to be created with a \'.<pid>\' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log.', Category = 'debug', Readonly = '0', Requires = 'ZM_EXTRA_DEBUG=1';
-+insert into Config set Id = 48, Name = 'ZM_PATH_SOCKS', Value = '/var/run/zm', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various Unix domain socket files that ZoneMinder uses', Help = 'ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option where those socket files go.', Category = 'paths', Readonly = '0', Requires = '';
-+insert into Config set Id = 49, Name = 'ZM_PATH_LOGS', Value = '/var/log/zoneminder', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to the various logs that the ZoneMinder daemons generate', Help = 'There are various daemons that are used by ZoneMinder to perform various tasks. Most generate helpful log files and this is where they go. They can be deleted if not required for debugging.', Category = 'paths', Readonly = '0', Requires = '';
- insert into Config set Id = 50, Name = 'ZM_WEB_TITLE_PREFIX', Value = 'ZM', Type = 'string', DefaultValue = 'ZM', Hint = 'string', Pattern = '(?-xism:^(.+)$)', Format = ' $1 ', Prompt = 'The title prefix displayed on each window', Help = 'If you have more than one installation of ZoneMinder it can be helpful to display different titles for each one. Changing this option allows you to customise the window titles to include further information to aid identification.', Category = 'web', Readonly = '0', Requires = '';
- insert into Config set Id = 51, Name = 'ZM_WEB_RESIZE_CONSOLE', Value = '1', Type = 'boolean', DefaultValue = 'yes', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Should the console window resize itself to fit', Help = 'Traditionally the main ZoneMinder web console window has resized itself to shrink to a size small enough to list only the monitors that are actually present. This is intended to make the window more unobtrusize but may not be to everyones tastes, especially if opened in a tab in browsers which support this kind if layout. Switch this option off to have the console window size left to the users preference', Category = 'web', Readonly = '0', Requires = '';
- insert into Config set Id = 52, Name = 'ZM_WEB_POPUP_ON_ALARM', Value = '1', Type = 'boolean', DefaultValue = 'yes', Hint = 'yes|no', Pattern = '(?i-xsm:^([yn]))', Format = ' ($1 =~ /^y/) ? \"yes\" : \"no\" ', Prompt = 'Should the monitor window jump to the top if an alarm occurs', Help = 'When viewing a live monitor stream you can specify whether you want the window to pop to the front if an alarm occurs when the window is minimised or behind another window. This is most useful if your monitors are over doors for example when they can pop up if someone comes to the doorway.', Category = 'web', Readonly = '0', Requires = '';
diff --git a/www-misc/zoneminder/zoneminder-1.22.3.ebuild b/www-misc/zoneminder/zoneminder-1.22.3.ebuild
deleted file mode 100644
index 06b674ada2c5..000000000000
--- a/www-misc/zoneminder/zoneminder-1.22.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v 1.4 2008/02/23 13:56:33 hollow Exp $
-
-inherit eutils webapp autotools depend.php depend.apache
-
-WEBAPP_MANUAL_SLOT="yes"
-
-MY_PV=${PV/_/-}
-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="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="mpeg"
-SLOT="0"
-
-DEPEND="app-admin/sudo
-	>=media-libs/jpeg-6b
-	>=dev-lang/perl-5.6.0
-	dev-perl/Archive-Tar
-	dev-perl/Archive-Zip
-	dev-perl/DateManip
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	dev-perl/Device-SerialPort
-	dev-perl/libwww-perl
-	dev-perl/MIME-Lite
-	dev-perl/MIME-tools
-	dev-perl/X10
-	virtual/perl-Getopt-Long
-	virtual/perl-libnet
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes"
-
-RDEPEND="dev-perl/DBD-mysql
-	mpeg? ( media-video/ffmpeg )
-	media-libs/netpbm"
-
-# 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}-${MY_PV}
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use mysql
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/Makefile.am.patch
-	epatch "${FILESDIR}"/zm_create.sql.in.diff
-	epatch "${FILESDIR}"/ffmpeg.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --with-mysql=/usr \
-		--with-webdir="${MY_HTDOCSDIR}" \
-		--with-cgidir="${MY_CGIBINDIR}" \
-		--with-webuser=apache \
-		--with-webgroup=apache \
-		$(use_with mpeg ffmpeg /usr) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	keepdir /var/run/zm
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	fperms 0644 /etc/zm.conf
-
-	keepdir /var/log/${PN}
-	fowners apache:apache /var/log/${PN}
-	fowners apache:apache /var/run/zm
-
-	newinitd "${FILESDIR}"/init.d zoneminder
-	newconfd "${FILESDIR}"/conf.d zoneminder
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README README.[prt]* TODO
-	dohtml README.html
-
-	insinto /usr/share/${PN}/db
-	doins db/zm_u* db/zm_create.sql
-
-	for DIR in events images sound; do
-		dodir "${MY_HTDOCSDIR}"/${DIR}
-		webapp_serverowned "${MY_HTDOCSDIR}"/${DIR}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-2.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade.txt
-
-	webapp_src_install
-}
diff --git a/www-misc/zoneminder/zoneminder-1.23.1.ebuild b/www-misc/zoneminder/zoneminder-1.23.1.ebuild
deleted file mode 100644
index 801f4a67d4e5..000000000000
--- a/www-misc/zoneminder/zoneminder-1.23.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.1.ebuild,v 1.1 2008/02/23 14:39:39 hollow Exp $
-
-inherit eutils webapp autotools depend.php depend.apache multilib
-
-WEBAPP_MANUAL_SLOT="yes"
-
-MY_PV=${PV/_/-}
-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="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ffmpeg X10"
-SLOT="0"
-
-DEPEND="app-admin/sudo
-	dev-libs/libpcre
-	>=media-libs/jpeg-6b
-	net-libs/gnutls
-	>=dev-lang/perl-5.6.0
-	dev-perl/Archive-Tar
-	dev-perl/Archive-Zip
-	dev-perl/DateManip
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	dev-perl/Device-SerialPort
-	dev-perl/libwww-perl
-	dev-perl/MIME-Lite
-	dev-perl/MIME-tools
-	dev-perl/PHP-Serialization
-	virtual/perl-Getopt-Long
-	virtual/perl-libnet
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	X10? ( dev-perl/X10 )"
-
-RDEPEND="dev-perl/DBD-mysql
-	ffmpeg? ( media-video/ffmpeg )
-	media-libs/netpbm"
-
-# 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}-${MY_PV}
-
-pkg_setup() {
-	webapp_pkg_setup
-	require_php_with_use mysql
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PV}/Makefile.am.patch
-	epatch "${FILESDIR}"/${PV}/zm_create.sql.in.patch
-	epatch "${FILESDIR}"/${PV}/zm_mpeg_ofc.patch
-	epatch "${FILESDIR}"/${PV}/zm_remote_camera.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --with-libarch=$(get_libdir) \
-		--with-mysql=/usr \
-		$(use_with ffmpeg ffmpeg /usr) \
-		$(use_enable debug) \
-		$(use_enable debug crashtrace) \
-		--with-webdir="${MY_HTDOCSDIR}" \
-		--with-cgidir="${MY_CGIBINDIR}" \
-		--with-webuser=apache \
-		--with-webgroup=apache \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	keepdir /var/run/zm
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	fperms 0644 /etc/zm.conf
-
-	keepdir /var/log/${PN}
-	fowners apache:apache /var/log/${PN}
-	fowners apache:apache /var/run/zm
-
-	newinitd "${FILESDIR}"/init.d zoneminder
-	newconfd "${FILESDIR}"/conf.d zoneminder
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	insinto /usr/share/${PN}/db
-	doins db/zm_u* db/zm_create.sql
-
-	for DIR in events images sound; do
-		dodir "${MY_HTDOCSDIR}"/${DIR}
-		webapp_serverowned "${MY_HTDOCSDIR}"/${DIR}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-2.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade.txt
-
-	webapp_src_install
-}
diff --git a/www-misc/zoneminder/zoneminder-1.23.3.ebuild b/www-misc/zoneminder/zoneminder-1.23.3.ebuild
index 36af2ca21924..3c48418fa21b 100644
--- a/www-misc/zoneminder/zoneminder-1.23.3.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.23.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild,v 1.1 2008/05/06 10:00:23 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild,v 1.2 2008/05/17 07:40:13 wrobel Exp $
 
 inherit eutils autotools depend.php depend.apache multilib
 
@@ -51,7 +51,7 @@ need_php_httpd
 S="${WORKDIR}"/${MY_PN}-${MY_PV}
 
 pkg_setup() {
-	require_php_with_use mysql
+	require_php_with_use mysql sockets apache2
 }
 
 src_unpack() {