punt old, fails to compile against jpeg8

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64, RepoMan options: --force)

5 files changed, 0 insertions, 243 deletions

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index c208138d935c..f06c6b7291a7 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,6 +1,3 @@
-AUX 1.23.1/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8 SHA1 84024eb973f86e28d0fefa40c9a233f90c52a262 SHA256 301f23e57099c6841601017aed5a834a2ffc5e95a4b2f7e273272d4b11344ac3
-AUX 1.23.1/zm_create.sql.in.patch 19013 RMD160 076dbeb30a4758e4ff708139e40302d6db7ac3f0 SHA1 cc8d2874e4eb382e081e84ff35491f23cb7ba2e1 SHA256 2f60f8f27e9d670859a8dfa5c30e45279a663a40227d9a259b11262e7f97b0d7
-AUX 1.23.1/zm_remote_camera.patch 1551 RMD160 03024108ba012b7e39620ed950b96df1c4ab63f3 SHA1 cfda28aa3a17c8dda9d5e7dc014dda6a81b5a0a1 SHA256 fdce259c8bbe18bde09c99c270e8615531f4340db98eb28461177b2b305ed097
 AUX 1.24.2/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8 SHA1 84024eb973f86e28d0fefa40c9a233f90c52a262 SHA256 301f23e57099c6841601017aed5a834a2ffc5e95a4b2f7e273272d4b11344ac3
 AUX 1.24.2/db_upgrade_script_location.patch 412 RMD160 368052be3fc8f32276cd59a146fd99a3b23b05f8 SHA1 a7a04bb212c0ca6ec693ca821d4c5de56b3e65c9 SHA256 3ffaa44c013dd27c3e5e937de77158c60b4cd37f28e1fc42dd7283f80075b067
 AUX 1.24.2/zm_build_fix.patch 407 RMD160 ac45177bb3f06dd0fd9cd1f938b90ba2297d07d2 SHA1 d7c6978c9fc71baf3c86b2405959fbe3da5eec99 SHA256 51f1effb3551bc8f9fbfe9e516db5f318091965f83dbf9e9772e6c7a02d2e640
@@ -10,9 +7,7 @@ AUX 1.24.2/zm_remote_camera_http.patch 1566 RMD160 644a681789d0ecf424156cde4b4ea
 AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 392 RMD160 075f5bb61776cc55bca82b3725b8e6f0cdc877e8 SHA1 76de21342416796b1b412f19d8f7bedadc41ce2b SHA256 3a9725e1f5d20b25db4afc450a1754578885d542f696ea2fa0f3ea083b385321
-DIST ZoneMinder-1.23.3.tar.gz 764528 RMD160 cf04dcd61891a5b8b1a30d738a8b1274ecefad70 SHA1 aaca4fb26b2f09d57b1901f49c538d7e46963254 SHA256 76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
 DIST ZoneMinder-1.24.2.tar.gz 965521 RMD160 3ec5ca1a6d418feeeecd6dc3c4a78a79f5ead373 SHA1 ea854c941b83374a352d7d794a4462e279fea487 SHA256 fd8475138ccee8870534f1210a3d1e3e1990e963dd73146a6d310dc71c463dca
-EBUILD zoneminder-1.23.3.ebuild 3706 RMD160 7c05c50b9ec321c19e98d9fd83f43049bcff0008 SHA1 9029de5bd35de05bfcce0a32c848b2fbf49104cf SHA256 5f8e1a8494e3a7fa6c6b2e227fcfbe55330673491aaacb47e7b45a6264a4a6f0
 EBUILD zoneminder-1.24.2.ebuild 4100 RMD160 f4bbc7244785439bbb10691156e737d81487f3a7 SHA1 1db9b2ce429ffcec296a2340edcaf46085d1e933 SHA256 6b9581677d09c2ce6972245dabb3aa1e00ca4e9d15380b0c7dab5ad65fc2b801
 MISC ChangeLog 7279 RMD160 c97127081ec9eca2533d4993aa38210234b46764 SHA1 39e3ce39303908664449566974a30f89ca40fd84 SHA256 2f59c773186f9590a887b7b20b9e61df682c7c78ac1dd3b2edcb2a623e67f2f2
 MISC metadata.xml 260 RMD160 c12fd64bd707f1295bbe662f72c9cfa50e9774e2 SHA1 75c4629846789f80cee0e163f2822d725d1388fb SHA256 3059d89f940a19b5e4c03c954c4fe960c0f7daeff0f57540271fa0aec70a7b24
diff --git a/www-misc/zoneminder/files/1.23.1/Makefile.am.patch b/www-misc/zoneminder/files/1.23.1/Makefile.am.patch
deleted file mode 100644
index 90dd4769efbf..000000000000
--- a/www-misc/zoneminder/files/1.23.1/Makefile.am.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: ZoneMinder-1.23.1/Makefile.am
-===================================================================
---- ZoneMinder-1.23.1.orig/Makefile.am
-+++ ZoneMinder-1.23.1/Makefile.am
-@@ -19,8 +19,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/1.23.1/zm_create.sql.in.patch b/www-misc/zoneminder/files/1.23.1/zm_create.sql.in.patch
deleted file mode 100644
index 026030059dbd..000000000000
--- a/www-misc/zoneminder/files/1.23.1/zm_create.sql.in.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: ZoneMinder-1.23.1/db/zm_create.sql.in
-===================================================================
---- ZoneMinder-1.23.1.orig/db/zm_create.sql.in
-+++ ZoneMinder-1.23.1/db/zm_create.sql.in
-@@ -618,21 +618,21 @@ insert into Config set Id = 34, Name = '
- insert into Config set Id = 35, 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 = 36, 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 = 37, 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 = 38, 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 = 39, 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 = 38, Name = 'ZM_PATH_MPEG_ENCODE', Value = '/usr/bin/mpeg_encode', Type = 'string', DefaultValue = '/usr/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 = 39, Name = 'ZM_PATH_FFMPEG', Value = '/usr/bin/ffmpeg', Type = 'string', DefaultValue = '/usr/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 = 40, 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 = 41, 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 = 42, 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 = 43, 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 = 43, 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 = 44, 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 = 45, 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 = 46, 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 = 47, 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 = 48, 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 = 49, 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 = 50, 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 = 51, 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 = 52, 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 = 50, 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 = 51, 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 = 52, 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 = 53, Name = 'ZM_PATH_SWAP', Value = '/tmp', Type = 'string', DefaultValue = '/tmp', Hint = '/absolute/path/to/somewhere', Pattern = '(?-xism:^((?:/[^/]*)+?)/?$)', Format = ' $1 ', Prompt = 'Path to location for temporary swap images used in streaming', Help = 'Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.', Category = 'paths', Readonly = '0', Requires = '';
- insert into Config set Id = 54, 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 = 55, 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 = '';
diff --git a/www-misc/zoneminder/files/1.23.1/zm_remote_camera.patch b/www-misc/zoneminder/files/1.23.1/zm_remote_camera.patch
deleted file mode 100644
index bcc6c5fb15f2..000000000000
--- a/www-misc/zoneminder/files/1.23.1/zm_remote_camera.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: ZoneMinder-1.23.1/src/zm_remote_camera.cpp
-===================================================================
---- ZoneMinder-1.23.1.orig/src/zm_remote_camera.cpp
-+++ ZoneMinder-1.23.1/src/zm_remote_camera.cpp
-@@ -356,6 +356,14 @@ int RemoteCamera::GetResponse()
- 							format = JPEG;
- 							state = CONTENT;
- 						}
-+						else if ( !strcasecmp( content_type, "image/mpeg" ) )
-+						{
-+							// Single image
-+							mode = SINGLE_IMAGE;
-+							format = JPEG;
-+							state = CONTENT;
-+
-+						}
- 						else if ( !strcasecmp( content_type, "image/x-rgb" ) )
- 						{
- 							// Single image
-@@ -453,6 +461,10 @@ int RemoteCamera::GetResponse()
- 					{
- 						format = JPEG;
- 					}
-+					else if ( !strcasecmp( content_type, "image/mpeg" ) )
-+					{
-+						format = JPEG;
-+					}
- 					else if ( !strcasecmp( content_type, "image/x-rgb" ) )
- 					{
- 						format = X_RGB;
-@@ -783,6 +795,13 @@ int RemoteCamera::GetResponse()
- 							format = JPEG;
- 							state = CONTENT;
- 						}
-+						else if ( !strcasecmp( content_type, "image/mpeg" ) )
-+						{
-+							// Single image
-+							mode = SINGLE_IMAGE;
-+							format = JPEG;
-+							state = CONTENT;
-+						}
- 						else if ( !strcasecmp( content_type, "image/x-rgb" ) )
- 						{
- 							// Single image
-@@ -947,6 +966,10 @@ int RemoteCamera::GetResponse()
- 					{
- 						format = JPEG;
- 					}
-+					else if ( !strcasecmp( content_type, "image/mpeg" ) )
-+					{
-+						format = JPEG;
-+					}
- 					else if ( !strcasecmp( content_type, "image/x-rgb" ) )
- 					{
- 						format = X_RGB;
diff --git a/www-misc/zoneminder/zoneminder-1.23.3.ebuild b/www-misc/zoneminder/zoneminder-1.23.3.ebuild
deleted file mode 100644
index 43888e0013a6..000000000000
--- a/www-misc/zoneminder/zoneminder-1.23.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 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.11 2011/02/27 20:09:33 ssuominen Exp $
-
-inherit eutils autotools depend.php depend.apache multilib perl-module
-
-MY_PV=${PV/_/-}
-MY_PN="ZoneMinder"
-
-PATCH_PV="1.23.1"
-
-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"
-SLOT="0"
-
-DEPEND="app-admin/sudo
-	dev-libs/libpcre
-	virtual/jpeg
-	net-libs/gnutls
-	>=dev-lang/perl-5.6.0
-	virtual/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"
-
-RDEPEND="dev-perl/DBD-mysql
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	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() {
-	require_php_with_use mysql sockets apache2
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PATCH_PV}/Makefile.am.patch
-	epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch
-	epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera.patch
-	sed -i \
-		-e 's:ffmpeg/avformat.h:libavformat/avformat.h:' \
-		-e 's:ffmpeg/swscale.h:libswscale/swscale.h:' \
-		src/zm_mpeg.h || die "404. File not found sedding src/zmpeg.h"
-	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="/var/www/zoneminder/htdocs" \
-		--with-cgidir="/var/www/zoneminder/cgi-bin" \
-		--with-webuser=apache \
-		--with-webgroup=apache \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	keepdir /var/run/zm
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	fperms 0640 /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
-
-	insinto /etc/apache2/vhosts.d
-	doins "${FILESDIR}"/10_zoneminder.conf
-
-	for DIR in events images sounds temp; do
-		dodir   /var/www/zoneminder/htdocs/${DIR}
-		keepdir /var/www/zoneminder/htdocs/${DIR}
-	done
-
-	fixlocalpod
-}
-
-pkg_postinst() {
-	elog ""
-	elog "0. If this is a new installation, you will need to create a MySQL database"
-	elog "   for ${PN} to use. (see http://www.gentoo.org/doc/en/mysql-howto.xml)."
-	elog "   Once you completed that you should execute the following:"
-	elog ""
-	elog " cd /usr/share/${PN}"
-	elog " mysql -u <my_database_user> -p<my_database_pass> <my_zoneminder_db> < db/zm_create.sql"
-	elog ""
-	elog "1.  Set your database settings in /etc/zm.conf"
-	elog ""
-	elog "2.  Start the ${PN} daemon:"
-	elog ""
-	elog "  /etc/init.d/${PN} start"
-	elog ""
-	elog "3. Finally point your browser to http://localhos/${PN}"
-	elog ""
-	elog ""
-	elog "If you are upgrading, you will need to run the zmupdate.pl script:"
-	elog ""
-	elog " /usr/bin/zmupdate.pl version=<from version> [--user=<my_database_user> --pass=<my_database_pass>]"
-	elog ""
-}