8 changes: 4 additions & 4 deletions Gentoo/media-plugins/mythweather/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DIST mythtv-0.24.2_p20120221.tar.gz 69787595 RMD160 8dea4dd4a2b68dc780b0a03061f46f5cbb30c8c8 SHA1 704b775aa771c8ddc2de8c6ef8cde39ab5a60da5 SHA256 d0e5addc219a33b0280c38c3db571846644fb6f73657e91fad43c344607b05ae
DIST mythtv-0.25_pre20120223.tar.gz 72904164 RMD160 89a03e24452ec7e71914380d9ebf414b47f06801 SHA1 effafe5df5b652c4638719a82fc72b45ac22e5bf SHA256 332d1a96664139b1aea75012baf437218258d34973c80b304e67d7acddd8576a
EBUILD mythweather-0.24.2_p20120221.ebuild 683 RMD160 4467e3dccd0477654d839baec6d97dd365a450f4 SHA1 fcbc88c52e322c53ea344fd2df1f3ebe861e392c SHA256 ef1f23897b74094b815280e317683edd0d1366a8f6aa4271861c43e6be3ee43f
EBUILD mythweather-0.25_pre20120223.ebuild 699 RMD160 f54fd9e1a3a96d6a7c928cf7963e16e39c559fa2 SHA1 3069099c8683c999c9f2521e3d7b1db8eb25106c SHA256 0768fc1a56785b2a3408523fe4e028a383ce0d0d34deadbcd97fd104690b8a72
DIST mythtv-0.24.2_p20120315.tar.gz 69791633 RMD160 451ed05c92b7e52a12c9b0bf56afc27def3bc28d SHA1 fc5f76a7e3be03aa7838ffb8f117cb48abbf5aa4 SHA256 bf1bb5ff9fcb2c688d478ffc7101a96e9e422406baa928dc33f507714a7289b8
DIST mythtv-0.25_rc20120329.tar.gz 73478074 RMD160 6c547f68a76c2d3e75f658a5ed9ca2524f19b112 SHA1 f9acb279a1da09ad18c8771427e42c8ed127e8f9 SHA256 6e81e33005d1fa8acd4cd24c7a8c060f84e2c9ec3ea7b778b77051efdb945e53
EBUILD mythweather-0.24.2_p20120315.ebuild 701 RMD160 50a94416f89ffada62292d95511e7ce1ab87ffe0 SHA1 f4845ca820d784de2bca91bb11b268a30f6b8cd2 SHA256 ef82463b4adecf64d18825a1df2b9184279634888c396de77eb21ec7032f25cd
EBUILD mythweather-0.25_rc20120329.ebuild 698 RMD160 edde2942ead56050a971217b0986bda6448ae1c8 SHA1 5a3ef08b0bf7bc346e8d3464bc039b32f5886716 SHA256 58b9bec2994bac9752afe62bf4b0c532e368ea538324d2e56ba816e62da713e7
7 changes: 4 additions & 3 deletions ...ather/mythweather-0.24.2_p20120221.ebuild → ...ather/mythweather-0.24.2_p20120315.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

EAPI="2"

MYTHTV_VERSION="v0.24.2-15-gc29d36f"
MYTHTV_VERSION="v0.24.2-27-g322de47"
MYTHTV_BRANCH="fixes/0.24"
MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
MYTHTV_SREV="c29d36f"
MYTHTV_REV="322de47d5b10a4d6f357a5941c0f690eb01a98ec"
MYTHTV_SREV="322de47"

inherit mythtv-plugins

Expand All @@ -23,4 +23,5 @@ DEPEND="dev-perl/DateManip
dev-perl/XML-SAX
dev-perl/DateTime-Format-ISO8601
dev-perl/XML-XPath
dev-perl/JSON
"
6 changes: 3 additions & 3 deletions ...ather/mythweather-0.25_pre20120223.ebuild → ...eather/mythweather-0.25_rc20120329.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

EAPI="2"

MYTHTV_VERSION="v0.25pre-4673-g89c34ef"
MYTHTV_VERSION="v0.25-rc-106-gf73dbda"
MYTHTV_BRANCH="master"
MYTHTV_REV="89c34ef6b2e0e8688474ef546b799d54d8ec6242"
MYTHTV_SREV="89c34ef"
MYTHTV_REV="f73dbda4d44e3694c1374c2332ddfb80e2e7f355"
MYTHTV_SREV="f73dbda"

inherit mythtv-plugins

Expand Down
8 changes: 4 additions & 4 deletions Gentoo/media-plugins/mythzoneminder/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DIST mythtv-0.24.2_p20120221.tar.gz 69787595 RMD160 8dea4dd4a2b68dc780b0a03061f46f5cbb30c8c8 SHA1 704b775aa771c8ddc2de8c6ef8cde39ab5a60da5 SHA256 d0e5addc219a33b0280c38c3db571846644fb6f73657e91fad43c344607b05ae
DIST mythtv-0.25_pre20120223.tar.gz 72904164 RMD160 89a03e24452ec7e71914380d9ebf414b47f06801 SHA1 effafe5df5b652c4638719a82fc72b45ac22e5bf SHA256 332d1a96664139b1aea75012baf437218258d34973c80b304e67d7acddd8576a
EBUILD mythzoneminder-0.24.2_p20120221.ebuild 548 RMD160 4432eb7de089a938b0c45e4d41c3b5df0b7ceff0 SHA1 df663a4511f5d062837ca491cdd02d9c7d8848d1 SHA256 51fb7a07ffe99344f5478f08b99a90c49f4f96b3cd476dadee5ca6aa5284e32a
EBUILD mythzoneminder-0.25_pre20120223.ebuild 549 RMD160 16c208ed99ed7b195f81f14f5ba032e66ec18f70 SHA1 8ca55cb0a859edecb1ec7159fe38b92d751ee0e0 SHA256 e79be2c46f07a4caba19a13c01f5100d6d3216a3ece9f09ed8d00c25b8e031d2
DIST mythtv-0.24.2_p20120315.tar.gz 69791633 RMD160 451ed05c92b7e52a12c9b0bf56afc27def3bc28d SHA1 fc5f76a7e3be03aa7838ffb8f117cb48abbf5aa4 SHA256 bf1bb5ff9fcb2c688d478ffc7101a96e9e422406baa928dc33f507714a7289b8
DIST mythtv-0.25_rc20120329.tar.gz 73478074 RMD160 6c547f68a76c2d3e75f658a5ed9ca2524f19b112 SHA1 f9acb279a1da09ad18c8771427e42c8ed127e8f9 SHA256 6e81e33005d1fa8acd4cd24c7a8c060f84e2c9ec3ea7b778b77051efdb945e53
EBUILD mythzoneminder-0.24.2_p20120315.ebuild 548 RMD160 eab26785dd40313b2b96ddf59daf1a5cd32e2511 SHA1 d04e6ac5732340aacafb6c71509618188d759f22 SHA256 9dc920e0d5f8327fc92cd7a8bf9fc2886ad94f9eaf7d8a47685d543c2a367134
EBUILD mythzoneminder-0.25_rc20120329.ebuild 548 RMD160 91e2d5d00238f30640863d5bdc8197f42a80fc27 SHA1 a4df2c1e5677deb261d951d180278b293b65c6f5 SHA256 672e6d2177c806e30e2f2728dbcc4fcc7eb5eb87b2100f6ad2aae3788b467e28
6 changes: 3 additions & 3 deletions ...er/mythzoneminder-0.24.2_p20120221.ebuild → ...er/mythzoneminder-0.24.2_p20120315.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

EAPI="2"

MYTHTV_VERSION="v0.24.2-15-gc29d36f"
MYTHTV_VERSION="v0.24.2-27-g322de47"
MYTHTV_BRANCH="fixes/0.24"
MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
MYTHTV_SREV="c29d36f"
MYTHTV_REV="322de47d5b10a4d6f357a5941c0f690eb01a98ec"
MYTHTV_SREV="322de47"


inherit mythtv-plugins
Expand Down
6 changes: 3 additions & 3 deletions ...mythgame/mythgame-0.25_pre20120223.ebuild → ...der/mythzoneminder-0.25_rc20120329.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

EAPI="2"

MYTHTV_VERSION="v0.25pre-4673-g89c34ef"
MYTHTV_VERSION="v0.25-rc-106-gf73dbda"
MYTHTV_BRANCH="master"
MYTHTV_REV="89c34ef6b2e0e8688474ef546b799d54d8ec6242"
MYTHTV_SREV="89c34ef"
MYTHTV_REV="f73dbda4d44e3694c1374c2332ddfb80e2e7f355"
MYTHTV_SREV="f73dbda"


inherit mythtv-plugins
Expand Down
8 changes: 4 additions & 4 deletions Gentoo/media-tv/mythtv-bindings/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AUX Makefile 593 RMD160 be4fc971e29079b205d5d6e730762ad259221310 SHA1 b582a47e7194bec3b290011596c7172e154fb4ce SHA256 91622cd299670172160a23a065b6771252883283cadf27ea14ba3186f54680cd
DIST mythtv-0.24.2_p20120221.tar.gz 69787595 RMD160 8dea4dd4a2b68dc780b0a03061f46f5cbb30c8c8 SHA1 704b775aa771c8ddc2de8c6ef8cde39ab5a60da5 SHA256 d0e5addc219a33b0280c38c3db571846644fb6f73657e91fad43c344607b05ae
DIST mythtv-0.25_pre20120223.tar.gz 72904164 RMD160 89a03e24452ec7e71914380d9ebf414b47f06801 SHA1 effafe5df5b652c4638719a82fc72b45ac22e5bf SHA256 332d1a96664139b1aea75012baf437218258d34973c80b304e67d7acddd8576a
EBUILD mythtv-bindings-0.24.2_p20120221.ebuild 1548 RMD160 1820ba97df3a7d12fb196edd4c46e109df179669 SHA1 cb7416f36bf4f8ffa8973e4005d8dfdbf70889e6 SHA256 2285b43ab75291d6f31baa84205d15f94ee7f3b3c7e9ca12768e41cd69ac5e03
EBUILD mythtv-bindings-0.25_pre20120223.ebuild 1682 RMD160 e85043833e162db044761e69e9a36036a38ccb8a SHA1 6d7424791c30f0fbe7d879960d98e473867828b3 SHA256 483f68f8f87f0665584c9df3b19189bdc341513bb2c050f695f9080410b772a9
DIST mythtv-0.24.2_p20120315.tar.gz 69791633 RMD160 451ed05c92b7e52a12c9b0bf56afc27def3bc28d SHA1 fc5f76a7e3be03aa7838ffb8f117cb48abbf5aa4 SHA256 bf1bb5ff9fcb2c688d478ffc7101a96e9e422406baa928dc33f507714a7289b8
DIST mythtv-0.25_rc20120329.tar.gz 73478074 RMD160 6c547f68a76c2d3e75f658a5ed9ca2524f19b112 SHA1 f9acb279a1da09ad18c8771427e42c8ed127e8f9 SHA256 6e81e33005d1fa8acd4cd24c7a8c060f84e2c9ec3ea7b778b77051efdb945e53
EBUILD mythtv-bindings-0.24.2_p20120315.ebuild 1548 RMD160 692938b12cb84ce397d36f66e73707ff0208ec9f SHA1 bd12a6a74eb85f80d4a0f592c8309a24cc1d792b SHA256 1244f4a0e4417b35dac840d47003ccfb9509f64326aa539a99da916242eb4114
EBUILD mythtv-bindings-0.25_rc20120329.ebuild 1743 RMD160 13b77214f5a50051a63e38db682f8107c1fdbaba SHA1 e951b3dd01a16f7e76ce81197c88b9e967243cca SHA256 2db2d50ff879411e907332c4f3bf6f525901b613c3687dc388e0cf9ba7cdd487
6 changes: 3 additions & 3 deletions ...s/mythtv-bindings-0.24.2_p20120221.ebuild → ...s/mythtv-bindings-0.24.2_p20120315.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

EAPI=2
PYTHON_DEPEND="2"
MYTHTV_VERSION="v0.24.2-15-gc29d36f"
MYTHTV_VERSION="v0.24.2-27-g322de47"
MYTHTV_BRANCH="fixes/0.24"
MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
MYTHTV_SREV="c29d36f"
MYTHTV_REV="322de47d5b10a4d6f357a5941c0f690eb01a98ec"
MYTHTV_SREV="322de47"

inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python

Expand Down
15 changes: 10 additions & 5 deletions ...s/mythtv-bindings-0.25_pre20120223.ebuild → ...gs/mythtv-bindings-0.25_rc20120329.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild,v 1.4 2008/10/09 20:52:54 cardoe Exp $

EAPI=2
PYTHON_DEPEND="2"
MYTHTV_VERSION="v0.25pre-4673-g89c34ef"
PYTHON_DEPEND="2:2.6"
MYTHTV_VERSION="v0.25-rc-106-gf73dbda"
MYTHTV_BRANCH="master"
MYTHTV_REV="89c34ef6b2e0e8688474ef546b799d54d8ec6242"
MYTHTV_SREV="89c34ef"
MYTHTV_REV="f73dbda4d44e3694c1374c2332ddfb80e2e7f355"
MYTHTV_SREV="f73dbda"

inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python

Expand Down Expand Up @@ -35,9 +35,14 @@ RDEPEND="

DEPEND="${RDEPEND}"

pkg_setup() {
python_set_active_version 2
python_pkg_setup
}

src_configure() {
echo "PREFIX=/usr" > "${S}/config.mak"
echo "PYTHON=/usr/bin/python" >> "${S}/config.mak"
echo "PYTHON=$(PYTHON)" >> "${S}/config.mak"
use perl && echo "CONFIG_BINDINGS_PERL=yes" >> "${S}/config.mak"
use python && echo "CONFIG_BINDINGS_PYTHON=yes" >> "${S}/config.mak"
use php && echo "CONFIG_BINDINGS_PHP=yes" >> "${S}/config.mak"
Expand Down
12 changes: 6 additions & 6 deletions Gentoo/media-tv/mythtv/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
AUX bash_profile 63 RMD160 71ed6a00c824f8d2704b65371e54adb85ca6d861 SHA1 cd4bc03298d30fadb759d1a2463e930441c5a5e7 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9
AUX ffmpeg-sync.patch 457 RMD160 911dc0264e77e3ef62dea14a874c427b6aae4015 SHA1 9fb1f64029fed6c45463a2612376a2126e362c76 SHA256 ee3c283d1619e7609f58485e9858c0b2a77b8d14f2f47deba45c874aec09231b
AUX fixLdconfSandbox.25.patch 361 RMD160 014ca94c7c6af376329c17d963e785cfa6cc3278 SHA1 d55b186e273102bc552defe86cb20a45e3dca32e SHA256 98350ba0b696d102de8fc1b3ca1c34163b7290efea4b06e9f8281ab624431e47
AUX fixLdconfSandbox.25.patch 361 RMD160 e78ac75d289b75462167e50e91d0c262c312a43e SHA1 6f73b4661a5877148d82e7fc9b994c92f8bb8700 SHA256 e778d4aa3dfe5d4c5e8cdc8438c5c45deb9d89816eb28c117ecc80ce67215d54
AUX fixLdconfSandbox.patch 386 RMD160 83f311a9b28516310a8bc906c415be29d8c7818b SHA1 5dbc422510c2c7184567e8e2ed271c491c9ea325 SHA256 466668c48f3b21d64de464cf33971bcb1f12237da705a5a77dfa4fad1f687a93
AUX jobQueueIgnoreDeletedRecgroup.patch 584 RMD160 e63f531f84a77bb9035f89b6d539dfdcd5c253f7 SHA1 63aee351837ca82948c34730344aa88861008c8c SHA256 0ee1831a980ec5a5ce94e80b679b3088abbe60fc1ec0f12f258ba815ebcae123
AUX logcleanup.py 4469 RMD160 ff02c71acb420059a2112e8ef16905b0064946af SHA1 e12a169e0767c32b0e8172fd1e74d1e4030d0930 SHA256 37160ad2e02dc31bf8a428dbfe41c40b74ee96f3750843beee0246c4158edd59
AUX logcleanup.py 6648 RMD160 cad409268d82392893883070f01e032ef911bde4 SHA1 c194b83094cd78e0a4b8dfd289ebbe78420c3f0b SHA256 de482798dfa5ba44526cdca489d322c8f80fb0f204e9c62d48cfe92ef3624096
AUX mythbackend-0.18.2.conf 1430 RMD160 f966c40618592cae62a2e4345bb4cd5847ec0de6 SHA1 2a3cb59593c4fd1ba431b4ebe70b91782a418a02 SHA256 0b6d0514d410bdcbeaebded48488926fc2941edaeee518794d9884693a4eb9db
AUX mythbackend-0.18.2.rc 1128 RMD160 0297452b3d9fe09479c737d136a73171a35eb643 SHA1 df4fe1ca7750c3ed27c9f5bbeb28dcebb36f9b1d SHA256 be994a8b6690e830820e82316f4ccce5b7f84ce68213de75e3740818227f6f3c
AUX mythbackend-0.25.conf 2038 RMD160 0ea6f2436798374b31c4ee81a525146e407ee19c SHA1 dc187e336abe817e8586111c9c0671352feb2082 SHA256 f330a12db8e7eab7530f12d3800865c60bf7126168352b7456e2c795600e47b5
Expand All @@ -16,7 +16,7 @@ AUX runlogcleanup 101 RMD160 2e2c4b5a92d188c9b335d7a9c8e1415236ee4533 SHA1 d7c8d
AUX runmythfe 186 RMD160 e4b5bfeaecbf541e6cc45b6a9c0e5c048e3fccd0 SHA1 f5ec9dfd4781b28c0af8745c282ce242141590d8 SHA256 bebc665f37b21193be2f259cb8daf6863dfd4336e4e1424a7a989d6b679964fe
AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5bd668d91acdd61aa80d5cc8af5cac SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94
AUX xinitrc.25 243 RMD160 44fd2d562b73cfd7318fbb749600714d7eb68ada SHA1 814f8c7ced499f82480d7ed13ef2cf0a35090670 SHA256 2395822f0ae49e75668e5c1dc5497e9e728c4bd46fc7ded5fb51c2400c61a09a
DIST mythtv-0.24.2_p20120221.tar.gz 69787595 RMD160 8dea4dd4a2b68dc780b0a03061f46f5cbb30c8c8 SHA1 704b775aa771c8ddc2de8c6ef8cde39ab5a60da5 SHA256 d0e5addc219a33b0280c38c3db571846644fb6f73657e91fad43c344607b05ae
DIST mythtv-0.25_pre20120223.tar.gz 72904164 RMD160 89a03e24452ec7e71914380d9ebf414b47f06801 SHA1 effafe5df5b652c4638719a82fc72b45ac22e5bf SHA256 332d1a96664139b1aea75012baf437218258d34973c80b304e67d7acddd8576a
EBUILD mythtv-0.24.2_p20120221.ebuild 8275 RMD160 5f1a0b97f2afb0e38c0563bcbae2a3ccc48fcef0 SHA1 012e025a66371b09fcc7d42e2cc95e1223ec7214 SHA256 a0dc0ce39cfa913365bd6f8d010a8c8e8ed26f621d6bf75b3a6905074f3a7261
EBUILD mythtv-0.25_pre20120223.ebuild 8166 RMD160 a64dd38014d486c331ac0a17ca72c8cd920e12d2 SHA1 3178dc3f2acad17ab8963965ab96463de5cb322d SHA256 de49ad97871b3b588a09ee001b76813775f25977ffe3b217cf8ff2a5493b759b
DIST mythtv-0.24.2_p20120315.tar.gz 69791633 RMD160 451ed05c92b7e52a12c9b0bf56afc27def3bc28d SHA1 fc5f76a7e3be03aa7838ffb8f117cb48abbf5aa4 SHA256 bf1bb5ff9fcb2c688d478ffc7101a96e9e422406baa928dc33f507714a7289b8
DIST mythtv-0.25_rc20120329.tar.gz 73478074 RMD160 6c547f68a76c2d3e75f658a5ed9ca2524f19b112 SHA1 f9acb279a1da09ad18c8771427e42c8ed127e8f9 SHA256 6e81e33005d1fa8acd4cd24c7a8c060f84e2c9ec3ea7b778b77051efdb945e53
EBUILD mythtv-0.24.2_p20120315.ebuild 8275 RMD160 81b98043218b04ed78073d9a7bfe2af7132458b2 SHA1 303d15ec600423a9e480a158f1f67e01decc3881 SHA256 a6521161f1f6f0de1b90d376dfca009457e4d95520e46752ff6b75158f616713
EBUILD mythtv-0.25_rc20120329.ebuild 8273 RMD160 b47a7220b41a351d1658cb77d1c28693685a84cb SHA1 7680a8c742fb89f40945e342bf968e7d258510d3 SHA256 9b3f0f2604418c884c0d0de3a6398a69bdcbcdd6e023d10fb02406af8955af52
2 changes: 1 addition & 1 deletion Gentoo/media-tv/mythtv/files/fixLdconfSandbox.25.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Index: programs/mythfrontend/mythfrontend.pro
===================================================================
--- programs/mythfrontend/mythfrontend.pro (revision 26148)
+++ programs/mythfrontend/mythfrontend.pro (working copy)
@@ -107,3 +107,5 @@
@@ -110,3 +110,5 @@
DEFINES += USING_LIBDNS_SD
using_libcrypto: DEFINES += USING_RAOP
}
Expand Down
120 changes: 85 additions & 35 deletions Gentoo/media-tv/mythtv/files/logcleanup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# and however many rotated files have been generated for it.
#----------------------------

from __future__ import print_function

import os
import re
import sys
Expand Down Expand Up @@ -51,83 +53,131 @@ def __init__(self, path, filename):
self.children = []

def __repr__(self):
return "<LogFile %s, %s%s%s>" % \
(self.application, self.datetime.strftime("%b %d, %H:%M"),
" #%d" % self.sequence if self.sequence is not None else "",
" (compressed)" if self.compressed else "")
return "<LogFile {0}, {1}{2}{3}>".format(
self.application, self.datetime.strftime("%b %d, %H:%M"),
" #{0}".format(self.sequence) if self.sequence is not None else "",
" (compressed)" if self.compressed else "")

def __cmp__(self, other):
def __lt__(self, other):
if self.application != other.application:
return cmp(self.application, other.application)

return (self.application < other.application)
if self.datetime != other.datetime:
return cmp(self.datetime, other.datetime)

return (self.datetime < other.datetime)
if self.pid != other.pid:
return cmp(self.pid, other.pid)
return (self.pid < other.pid)

if self.sequence != other.sequence:
if self.sequence is None:
return -1
if other.sequence is None:
return 1
return cmp(self.sequence, other.sequence)
if self.sequence == other.sequence:
return False
if self.sequence is None:
return True
if other.sequence is None:
return False
return (self.sequence < other.sequence)

return 0
def __gt__(self, other):
if self.application != other.application:
return (self.application > other.application)
if self.datetime != other.datetime:
return (self.datetime > other.datetime)
if self.pid != other.pid:
return (self.pid > other.pid)

if self.sequence == other.sequence:
return False
if self.sequence is None:
return False
if other.sequence is None:
return True
return (self.sequence > other.sequence)

def __eq__(self, other):
return (self.application == other.application) and \
(self.datetime == other.datetime) and \
(self.pid == other.pid) and \
(self.sequence == other.sequence)

def append(self, child):
self.children.append(child)

def delete(self):
for child in self.children:
child.delete()
#print 'deleting %s' % os.path.join(self.path, self.filename)
os.unlink(os.path.join(self.path, self.filename))

def deletelogs(instances, opts):
deletelist = []
instances.sort(reverse=True)
while len(instances) > int(opts.minfiles):
if instances[0].lastmod > (datetime.now() -\
cur = instances.pop()
if instances[-1].lastmod < (datetime.now() -\
timedelta(hours=24*int(opts.minage))):
return
instances.pop(0).delete()
deletelist.append(cur)
if len(deletelist):
print("Deleting {0} log sets ({1} files) for {2}".format(
len(deletelist),
sum([len(item.children)+1 for item in deletelist]),
deletelist[0].application))
for item in deletelist:
# print(" deleting {0}".format(item))
item.delete()

def main(opts):
ls = sorted(LogFile.filter(opts.logpath, os.listdir(opts.logpath)))
ls = LogFile.filter(opts.logpath, os.listdir(opts.logpath))
ls.sort(reverse=True)

if len(ls) == 0:
print "Warning: Empty log path!"
print("Warning: Empty log path!")
sys.exit(1)

cur = None
while len(ls):
f = ls.pop(0)
f = ls.pop()
if cur is None:
# first run of a new application name
# start collecting instances
instances = [f]
cur = f
continue

if cur.application != f.application:
ls.insert(0,f)
# new application name, run existing instances and restart loop
ls.append(f)
cur = None
deletelogs(instances, opts)
continue

if (cur.datetime != f.datetime) and (cur.pid != f.pid):
if (cur.datetime != f.datetime) or (cur.pid != f.pid):
# new instance of existing application
cur = f
instances.append(f)
continue

# logrotate copy of current instance
# mark as child for collective handling
cur.append(f)

deletelogs(instances, opts)

if __name__ == "__main__":
parser = OptionParser()
parser.add_option("-p", "--path", dest="logpath", default="/var/log/mythtv",
help="Path where log files are stored")
parser.add_option("-n", "--min-files", dest="minfiles", default="5",
help="Minimum number of logs per application to keep")
parser.add_option("-t", "--min-age", dest="minage", default="7",
help="Minimum time (days) to keep log files")

(opts, args) = parser.parse_args()
try:
from argparse import ArgumentParser
except ImportError:
parser = OptionParser()
parser.add_option("-p", "--path", dest="logpath", default="/var/log/mythtv",
help="Path where log files are stored")
parser.add_option("-n", "--min-files", dest="minfiles", default="5",
help="Minimum number of logs per application to keep")
parser.add_option("-t", "--min-age", dest="minage", default="7",
help="Minimum time (days) to keep log files")
(opts, args) = parser.parse_args()
else:
parser = ArgumentParser()
parser.add_argument('-p', "--path", dest="logpath", default="/var/log/mythtv",
help="Path where log files are stored")
parser.add_argument('-n', "--min-files", dest="minfiles", type=int, default=5,
help="Minimum number of logs per application to keep")
parser.add_argument("-t", "--min-age", dest="minage", type=int, default=7,
help="Minimum time (days) to keep log files")
opts = parser.parse_args()

main(opts)
6 changes: 3 additions & 3 deletions ...-tv/mythtv/mythtv-0.24.2_p20120221.ebuild → ...-tv/mythtv/mythtv-0.24.2_p20120315.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

EAPI=2
PYTHON_DEPEND="2"
MYTHTV_VERSION="v0.24.2-15-gc29d36f"
MYTHTV_VERSION="v0.24.2-27-g322de47"
MYTHTV_BRANCH="fixes/0.24"
MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
MYTHTV_SREV="c29d36f"
MYTHTV_REV="322de47d5b10a4d6f357a5941c0f690eb01a98ec"
MYTHTV_SREV="322de47"

inherit flag-o-matic multilib eutils qt4-r2 mythtv toolchain-funcs python linux-info

Expand Down
38 changes: 22 additions & 16 deletions ...-tv/mythtv/mythtv-0.25_pre20120223.ebuild → ...a-tv/mythtv/mythtv-0.25_rc20120329.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# $Header:$

EAPI=2
PYTHON_DEPEND="2"
MYTHTV_VERSION="v0.25pre-4673-g89c34ef"
PYTHON_DEPEND="python? 2:2.6"
MYTHTV_VERSION="v0.25-rc-106-gf73dbda"
MYTHTV_BRANCH="master"
MYTHTV_REV="89c34ef6b2e0e8688474ef546b799d54d8ec6242"
MYTHTV_SREV="89c34ef"
MYTHTV_REV="f73dbda4d44e3694c1374c2332ddfb80e2e7f355"
MYTHTV_SREV="f73dbda"

inherit flag-o-matic multilib eutils qt4-r2 mythtv toolchain-funcs python
inherit linux-info
Expand Down Expand Up @@ -109,6 +109,7 @@ MYTHTV_GROUPS="video,audio,tty,uucp"

pkg_setup() {
python_set_active_version 2
python_pkg_setup

enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
usermod -a -G ${MYTHTV_GROUPS} mythtv
Expand All @@ -129,18 +130,18 @@ src_prepare() {

epatch "${FILESDIR}/fixLdconfSandbox.25.patch"

if use experimental
then
epatch "${FILESDIR}/optimizeMFDBClearingBySource-3.patch"
epatch "${FILESDIR}/jobQueueIgnoreDeletedRecgroup.patch"

if has_version ">=virtual/mysql-5.5"
then
epatch "${FILESDIR}/mythtv-8585-use_proper_ISO_SQL_format_in_database_logging.patch"
fi

true
fi
# if use experimental
# then
# epatch "${FILESDIR}/optimizeMFDBClearingBySource-3.patch"
# epatch "${FILESDIR}/jobQueueIgnoreDeletedRecgroup.patch"
#
# if has_version ">=virtual/mysql-5.5"
# then
# epatch "${FILESDIR}/mythtv-8585-use_proper_ISO_SQL_format_in_database_logging.patch"
# fi
#
# true
# fi
}

src_configure() {
Expand Down Expand Up @@ -178,6 +179,11 @@ src_configure() {
myconf="${myconf} --without-bindings=perl,python"
fi

if use python
then
myconf="${myconf} --python=$(PYTHON)"
fi

if use debug
then
myconf="${myconf} --compile-type=debug"
Expand Down
4 changes: 2 additions & 2 deletions Gentoo/media-tv/nuvexport/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DIST nuvexport-0.5_p20101213.tar.gz 46109 RMD160 0062782fe9b10083840bf7548e37290af34c3aaa SHA1 bdd57436c1291b6784166c51a2786ef82a542a64 SHA256 cdba289b0f28c2c16f3949735fa1cf5a188b3d40cffcdafda59b1491e460bfca
EBUILD nuvexport-0.5_p20101213.ebuild 726 RMD160 dca3402c065389438eb47cfa9a48abf4af9548f4 SHA1 872f18a70a1c084e3da0c3f5a4117b9dfda28f55 SHA256 3eb7fdcc492f7556f0a5aa2a67b05631812bb2bae1046ff71297de588190ac1c
DIST nuvexport-0.5_p20120306.tar.gz 43225 RMD160 abca6fe19280d949f00138b7526ffb5010eab81b SHA1 00cc9a83200bd5e3f775e40ca9bb91ef2876e47e SHA256 43f5fcb822f20e1ea293d30e1bc3a26704873d4b464d3f7b4aeba25977d2a04a
EBUILD nuvexport-0.5_p20120306.ebuild 718 RMD160 9fd593413c5ee39c2d942b8a82bf8205572e23e3 SHA1 050b3e8a0efd75500e83467e936be48842e16e82 SHA256 2e83445dacf803381f793bd8d75280e1bf76cc91823c28e4770e7daa03acd095
8 changes: 4 additions & 4 deletions .../nuvexport/nuvexport-0.5_p20101213.ebuild → .../nuvexport/nuvexport-0.5_p20120306.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
EAPI=2

NUVEXPORT_BRANCH="master"
NUVEXPORT_REV="c18508f20448077762d23ab9207c5eb643324dc0"
NUVEXPORT_SREV="c18508f"
NUVEXPORT_REV="ad7e20af6e8961c4eea3b79b8022f86c6bf1b9d4"
NUVEXPORT_SREV="ad7e20a"
REPO="nuvexport"

inherit mythtv
Expand All @@ -15,7 +15,7 @@ DESCRIPTION="Export recordings from MythTV"

SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="+faac mplayer +x264 +xvid"
IUSE="+faac mplayer +xvid"

DEPEND=""
RDEPEND=">=dev-lang/perl-5.6
Expand All @@ -26,7 +26,7 @@ RDEPEND=">=dev-lang/perl-5.6
media-sound/sox[encode]
media-libs/id3lib
mplayer? ( media-video/mplayer[encode,mp3,faac?,xvid?] )
>=media-tv/mythtv-0.25_pre20110408[perl,xvid?,x264?]"
>=media-tv/mythtv-0.25_pre20120223[perl,hls,xvid?]"

src_install() {
einstall || die "einstall failed"
Expand Down
6 changes: 3 additions & 3 deletions Gentoo/www-apps/mythweb/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AUX 0.24-postinstall-en.txt 539 RMD160 8de049db466f3aa2312296844ac0c19ebf858f7a SHA1 b43475bda37459685af27edab883f64af779aa44 SHA256 5d057d10a319948a7378ddde134926f40a892a2142a65ba36a0e78cd7283f74a
DIST mythweb-0.24_p20111014.tar.gz 2037734 RMD160 030cd1f7ebe40f596ad3aee5f9de11c297dda02c SHA1 abe0f4ffafe7d1407e9001935e13cd423a67ad0f SHA256 bac72c715d11e8dacb6676bf73d5d5fbf233df74ecc2ffa8824b36c7217322e6
DIST mythweb-0.25_pre20111115.tar.gz 1388657 RMD160 b818b9ed5ead9d55350b560727bdc372ec6bb7a6 SHA1 c038ca499fb87420e15210345f6a7b0ef614b6ad SHA256 d183c9bafd2064374d7b4a3f0d27d3a57480bac41fddbe966f6889aea5383a6b
EBUILD mythweb-0.24_p20111014.ebuild 1193 RMD160 6619416f94bccc4ac7d43dd507770c4dde9ac23a SHA1 34e316dbc76a7c69763f27cd4d7ba95ec8f62bab SHA256 517a6d953de5a391b68276ea1fc7dc2354551fcbc27d6ff147c626d285dab1a9
EBUILD mythweb-0.25_pre20111115.ebuild 1191 RMD160 fb03ee05810285e3e939704072493d06632e0fa4 SHA1 1373c55049b8eb21846b3ba10c884e3c87d41a23 SHA256 26c04007d0180fe37f0d4f525255adeea2ae27ba596b49f1f5240fabedd4c151
DIST mythweb-0.25_rc20120329.tar.gz 1402716 RMD160 bef02fb3203f86ff1c869fc36fc8cc539de875dc SHA1 dac7138e72e3e7a71213f252f005af9a09b412df SHA256 0ff2266ed009008202efcc63959fea86b8afeac14bed0a0ac5769f04b069ef96
EBUILD mythweb-0.24_p20111014.ebuild 1197 RMD160 135bd9c2dc426c66dc999c56007bb166a566b5f8 SHA1 dd23cb9cf04bae0dc337a58364f253cc426d604d SHA256 54af27dda3237796d7eb9fc2bab869450650e7a7118964eb20f03aa06a978f2c
EBUILD mythweb-0.25_rc20120329.ebuild 1195 RMD160 65d5fb16df57fd0502f1cff70326afb72f2e1f3c SHA1 87d50c61e0b511c854f9744da41c3bef000b11cb SHA256 f6a5a1dcee031525dfd785cb72c863eff1a2533ddf28418a17b7919f9f0a47ef
4 changes: 2 additions & 2 deletions Gentoo/www-apps/mythweb/mythweb-0.24_p20111014.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
IUSE=""
KEYWORDS="amd64 x86 ~ppc"

RDEPEND="dev-lang/php[curl,json,mysql,session,posix]
|| ( <dev-lang/php-5.3[spl,pcre] >=dev-lang/php-5.3 )
RDEPEND="<dev-lang/php-5.4[curl,json,mysql,session,posix]
|| ( <dev-lang/php-5.3[spl,pcre] =dev-lang/php-5.3 )
dev-perl/DBI
dev-perl/DBD-mysql
dev-perl/Net-UPnP"
Expand Down
8 changes: 4 additions & 4 deletions ...s/mythweb/mythweb-0.25_pre20111115.ebuild → ...ps/mythweb/mythweb-0.25_rc20120329.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ EAPI=2

MYTHTV_VERSION=""
MYTHTV_BRANCH="master"
MYTHTV_REV="40cef91e1d226ca73a1d36d2976433456a35fcd4"
MYTHTV_SREV="40cef91"
MYTHTV_REV="56e714fbc22e1e39331a8e750200c2397280b1dd"
MYTHTV_SREV="56e714f"

inherit mythtv webapp depend.php

DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
IUSE=""
KEYWORDS="~amd64 ~x86 ~ppc"

RDEPEND="dev-lang/php[curl,json,mysql,session,posix]
|| ( <dev-lang/php-5.3[spl,pcre] >=dev-lang/php-5.3 )
RDEPEND="<dev-lang/php-5.4[curl,json,mysql,session,posix]

This comment has been minimized.

Sign in to view

Copy link
@ari

ari Apr 1, 2012

I don't understand how this expression is supposed to work, but on my system is causes a problem which looks like this. See how it expects PHP to be older than 5.3 and simultaneously 5.3?

Parent: (www-apps/mythweb-0.25_rc20120329::mythtv, ebuild scheduled for merge)
Depstring: =virtual/httpd-php-5*
Priority: runtime
ebuild: virtual/httpd-php-5.3::gentoo
installed: virtual/httpd-php-5.3::gentoo
ebuild: virtual/httpd-php-5.3::gentoo
installed: virtual/httpd-php-5.3::gentoo
installed: dev-lang/php-5.3.10::gentoo
installed: dev-lang/php-5.3.10::gentoo
Virtual Parent: (virtual/httpd-php-5.3::gentoo, installed)
Virtual Depstring: || ( =dev-lang/php-5.3_[apache2] =dev-lang/php-5.3_[cgi] =dev-lang/php-5.3*[fpm] )
Candidates: ['=virtual/httpd-php-5.3']
ebuild: virtual/httpd-php-5.3::gentoo
installed: virtual/httpd-php-5.3::gentoo

Child: (virtual/httpd-php-5.3::gentoo, installed) USE="(x86)"
Parent Dep: =virtual/httpd-php-5* required by (www-apps/mythweb-0.25_rc20120329::mythtv, ebuild scheduled for merge)

Candidates: virtual/httpd-php-5.3: ['=dev-lang/php-5.3*[apache2]']

Child: (virtual/httpd-php-5.3::gentoo, installed) USE="(x86)"
Parent Dep: =virtual/httpd-php-5.3 required by (www-apps/mythweb-0.25_rc20120329::mythtv, ebuild scheduled for merge)
installed: dev-lang/php-5.3.10::gentoo

Child: (dev-lang/php-5.3.10::gentoo, installed) USE="apache2 berkdb bzip2 cli crypt ctype curl fileinfo filter gd gdbm hash iconv ipv6 json mysql nls phar posix readline session simplexml ssl tokenizer unicode xml zlib -bcmath -calendar -cdb -cgi -cjk -curlwrappers -debug -doc -embed -enchant -exif -firebird -flatfile -fpm (-frontbase) -ftp -gmp -imap -inifile -intl -iodbc -kerberos -kolab -ldap -ldap-sasl -libedit -mhash -mssql -mysqli -mysqlnd -oci8-instant-client -odbc -pcntl -pdo -pic -postgres -qdbm -recode -sharedmem -snmp -soap -sockets -spell -sqlite -sqlite3 -suhosin (-sybase-ct) -sysvipc -threads -tidy -truetype -wddx -xmlreader -xmlrpc -xmlwriter -xpm -xsl -zip"
Parent Dep: =dev-lang/php-5.3*[apache2] required by (virtual/httpd-php-5.3::gentoo, installed)

Exiting... (www-apps/mythweb-0.25_rc20120329::mythtv, ebuild scheduled for merge)

Parent: (www-apps/mythweb-0.25_rc20120329::mythtv, ebuild scheduled for merge)
Depstring: || ( <dev-lang/php-5.3[spl,pcre] =dev-lang/php-5.3 )
Priority: runtime
Candidates: ['<dev-lang/php-5.3[spl,pcre]']

emerge: there are no ebuilds to satisfy "<dev-lang/php-5.3[spl,pcre]".
(dependency required by "www-apps/mythweb-0.25_rc20120329" [ebuild])
(dependency required by "@selected" [set])
(dependency required by "@world" [argument])
|| ( <dev-lang/php-5.3[spl,pcre] =dev-lang/php-5.3 )
dev-perl/DBI
dev-perl/DBD-mysql
dev-perl/Net-UPnP"
Expand Down