Skip to content

Commit a5cb10d

Browse files
jyavenardjyavenard
committed
Merge branch 'master' of github.com:MythTV/packaging
2 parents 1c725f9 + ca3a10f commit a5cb10d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+440
-1212
lines changed

‎Gentoo/dev-libs/libcec/Manifest‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DIST libcec-1.1.0_pre20120221.tar.gz 280098 RMD160 9176b1d6c488d2900c1b2dfbc57f2d06316c2072 SHA1 01c32db7bf39913e773a76cdb40c13b1a1b61da3 SHA256 da102f9b1894b572c8f0db42253b3a11f99b9b7647585516b09dce7a7cb132b9
2+
DIST libcec-1.5.0.tar.gz 279802 RMD160 624406ce20a2b5d52476c611bbdd6b66cacc2517 SHA1 798c484875a86a2721b1984ca0925fb06f6633b1 SHA256 04f0db9eb4172674ce57aa1fe4d50ce88fe06b38617b0f3b5a54616d847c257d
3+
EBUILD libcec-1.1.0_pre20120221.ebuild 716 RMD160 0c8600126917d3461cc81c312752cecf412dbf88 SHA1 ac052d05c19a5bebb20e29424247ed1adc76750b SHA256 a5b1afe5628bf9532fbf50a9350f7e9ae06055bced896f61b93b52a864706d3d
4+
EBUILD libcec-1.5.0.ebuild 714 RMD160 d3fdc3fe417d083fa2795770e0613a3f22a83bfa SHA1 a8097c71ddc9cdac5ef05a9f8b100651e292c835 SHA256 b277cb478dc35610019b7c0d39b54129ff2d65e8d9c98611a71443c6d42f68bb

‎Gentoo/dev-libs/libcec/libcec-1.1.0_pre20120221.ebuild‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Copyright 1999-2011 Gentoo Foundation
2+
# Distributed under the terms of the GNU General Public License v2
3+
# $Header:$
4+
5+
EAPI=2
6+
PYTHON_DEPEND="2"
7+
LIBCEC_VERSION="1.1.0-462-gabec5f1"
8+
LIBCEC_BRANCH="master"
9+
LIBCEC_REV="abec5f17e29ff169574dfd16a54380a19a8fc39b"
10+
LIBCEC_SREV="abec5f1"
11+
12+
inherit mythtv
13+
14+
DESCRIPTION="Library for interfacing Pulse-Eight CEC adapters"
15+
SLOT="0"
16+
KEYWORDS="~amd64 ~x86"
17+
18+
SDEPEND=" || ( sys-devel/autoconf sys-devel/automake ) "
19+
DEPEND="${SDEPEND}"
20+
21+
src_configure() {
22+
autoreconf -vif || die "automake failed"
23+
24+
local myconf="--prefix=/usr"
25+
26+
./configure ${myconf} || die "configure failed"
27+
}
28+
29+
src_compile() {
30+
emake || die "emake failed"
31+
}
32+
33+
src_install() {
34+
einstall || die "install failed"
35+
}
36+

‎Gentoo/dev-libs/libcec/libcec-1.5.0.ebuild‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Copyright 1999-2011 Gentoo Foundation
2+
# Distributed under the terms of the GNU General Public License v2
3+
# $Header:$
4+
5+
EAPI=2
6+
PYTHON_DEPEND="2"
7+
LIBCEC_VERSION="1.5.0-0-g0f1b44d"
8+
LIBCEC_BRANCH="master"
9+
LIBCEC_REV="0f1b44de471ac33cba9aa8f73bc174a17f606fdd"
10+
LIBCEC_SREV="0f1b44d"
11+
12+
inherit mythtv
13+
14+
DESCRIPTION="Library for interfacing Pulse-Eight CEC adapters"
15+
SLOT="0"
16+
KEYWORDS="~amd64 ~x86"
17+
18+
SDEPEND=" || ( sys-devel/autoconf sys-devel/automake ) "
19+
DEPEND="${SDEPEND}"
20+
21+
src_configure() {
22+
autoreconf -vif || die "automake failed"
23+
24+
local myconf="--prefix=/usr"
25+
26+
./configure ${myconf} || die "configure failed"
27+
}
28+
29+
src_compile() {
30+
emake || die "emake failed"
31+
}
32+
33+
src_install() {
34+
einstall || die "install failed"
35+
}
36+

‎Gentoo/eclass/mythtv-plugins.eclass‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ mythtv-plugins_pkg_setup() {
5151
MYTHPLUGINS="${MYTHPLUGINS} mythmusic"
5252
MYTHPLUGINS="${MYTHPLUGINS} mythnetvision"
5353
MYTHPLUGINS="${MYTHPLUGINS} mythnews"
54-
if [[ ${MY_PV} == "0.24.1" ]]; then
54+
if [[ ${MY_PV} =~ 0\.24\.[0-9] ]]; then
5555
MYTHPLUGINS="${MYTHPLUGINS} mythvideo"
5656
fi
5757
MYTHPLUGINS="${MYTHPLUGINS} mythweather"
@@ -77,7 +77,7 @@ mythtv-plugins_src_prepare() {
7777
mythtv-plugins_src_configure() {
7878
cd "${S}"
7979

80-
if hasq ${PN} ${MYTHPLUGINS} ; then
80+
if has ${PN} ${MYTHPLUGINS} ; then
8181
for x in ${MYTHPLUGINS} ; do
8282
if [[ ${PN} == ${x} ]] ; then
8383
myconf="${myconf} --enable-${x}"
@@ -99,7 +99,7 @@ mythtv-plugins_src_compile() {
9999
}
100100

101101
mythtv-plugins_src_install() {
102-
if hasq ${PN} ${MYTHPLUGINS}
102+
if has ${PN} ${MYTHPLUGINS}
103103
then
104104
cd "${S}"/${PN}
105105
else

‎Gentoo/eclass/mythtv.eclass‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,41 +16,59 @@ MY_PV="${PV%_*}"
1616
# what product do we want
1717
case "${PN}" in
1818
mythtv)
19+
PROJECT="MythTV"
1920
REPO="mythtv"
2021
MY_PN="mythtv"
21-
S="${WORKDIR}/MythTV-${REPO}-${MYTHTV_SREV}/${MY_PN}"
22+
S="${WORKDIR}/${PROJECT}-${REPO}-${MYTHTV_SREV}/${MY_PN}"
2223
;;
2324
mythtv-bindings)
25+
PROJECT="MythTV"
2426
REPO="mythtv"
2527
MY_PN="mythtv"
26-
S="${WORKDIR}/MythTV-${REPO}-${MYTHTV_SREV}/${MY_PN}"
28+
S="${WORKDIR}/${PROJECT}-${REPO}-${MYTHTV_SREV}/${MY_PN}"
2729
;;
2830
mythweb)
31+
PROJECT="MythTV"
2932
REPO="mythweb"
3033
MY_PN="mythweb"
31-
S="${WORKDIR}/MythTV-${REPO}-${MYTHTV_SREV}/"
34+
S="${WORKDIR}/${PROJECT}-${REPO}-${MYTHTV_SREV}/"
3235
;;
33-
nuvexport)
36+
nuvexport)
37+
PROJECT="MythTV"
3438
REPO="nuvexport"
3539
MY_PN="nuvexport"
3640
MYTHTV_REV="$NUVEXPORT_REV"
37-
S="${WORKDIR}/MythTV-${REPO}-${NUVEXPORT_SREV}/"
41+
S="${WORKDIR}/${PROJECT}-${REPO}-${NUVEXPORT_SREV}/"
42+
;;
43+
libcec)
44+
PROJECT="Pulse-Eight"
45+
REPO="libcec"
46+
MY_PN="libcec"
47+
MYTHTV_REV="${LIBCEC_REV}"
48+
S="${WORKDIR}/${PROJECT}-${REPO}-${LIBCEC_SREV}/"
3849
;;
3950
*)
51+
PROJECT="MythTV"
4052
REPO="mythtv"
4153
MY_PN="mythplugins"
42-
S="${WORKDIR}/MythTV-${REPO}-${MYTHTV_SREV}/${MY_PN}"
54+
S="${WORKDIR}/${PROJECT}-${REPO}-${MYTHTV_SREV}/${MY_PN}"
4355
;;
4456
esac
4557

4658
# _pre is from SVN trunk while _p and _beta are from SVN ${MY_PV}-fixes
4759
# TODO: probably ought to do something smart if the regex doesn't match anything
4860
[[ "${PV}" =~ (_alpha|_beta|_pre|_rc|_p)([0-9]+) ]] || {
49-
# assume a tagged release
50-
MYTHTV_REV="v${PV}"
61+
[[ "${PROJECT}" == "MythTV" ]] && {
62+
# assume a tagged release
63+
MYTHTV_REV="v${PV}"
64+
}
65+
66+
[[ "${PROJECT}" == "Pulse-Eight" ]] && {
67+
MYTHTV_REV="${REPO}-${PV}"
68+
}
5169
}
5270

5371
HOMEPAGE="http://www.mythtv.org"
5472
LICENSE="GPL-2"
55-
SRC_URI="https://github.com/MythTV/${REPO}/tarball/${MYTHTV_REV} -> ${REPO}-${PV}.tar.gz"
73+
SRC_URI="https://github.com/${PROJECT}/${REPO}/tarball/${MYTHTV_REV} -> ${REPO}-${PV}.tar.gz"
5674

‎Gentoo/media-plugins/mytharchive/Manifest‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DIST mythtv-0.24.1_p20120101.tar.gz 69785145 RMD160 4d72249680e508b9c93947e081671c03ef16ec1e SHA1 a5c29a823d4e95c10d291c2296f9ca6d3785319b SHA256 b58d0959e3087f957ccff84fbcda6b1dce8be6f2c6e3ee6b243967c0fc61e6d4
2-
DIST mythtv-0.25_pre20120103.tar.gz 72742162 RMD160 443c53261c781faff7e58cbe20c910a8fa69a337 SHA1 c3428cf0069aa955702e0931e1c5be90d875d2af SHA256 b1d940ef673d0d8311cbcfede2d5d1ae65d1caf7bf7d2d1a01e1d92b10f35ff9
3-
EBUILD mytharchive-0.24.1_p20120101.ebuild 548 RMD160 b4b15daeb9655224380bc7bce9593741e3fa9281 SHA1 b90ff408e3dde1940ecc4bba5d69e5c6571cb2ff SHA256 e7a215b9b6123b733609d60051388fed419f4b238568da8823ad17011781a647
4-
EBUILD mytharchive-0.25_pre20120103.ebuild 596 RMD160 1e75fc35b264f2cbb0ce0eaf826a65c95a9c17c9 SHA1 fbb214fc3bbb0cd3121ef6c34c4e5de95d8aacc0 SHA256 0c279b4608c2dcfc2206303cd1470bb84ac660a0dcf7e81ddd43defc57fa33b6
1+
DIST mythtv-0.24.2_p20120221.tar.gz 69787595 RMD160 8dea4dd4a2b68dc780b0a03061f46f5cbb30c8c8 SHA1 704b775aa771c8ddc2de8c6ef8cde39ab5a60da5 SHA256 d0e5addc219a33b0280c38c3db571846644fb6f73657e91fad43c344607b05ae
2+
DIST mythtv-0.25_pre20120223.tar.gz 72904164 RMD160 89a03e24452ec7e71914380d9ebf414b47f06801 SHA1 effafe5df5b652c4638719a82fc72b45ac22e5bf SHA256 332d1a96664139b1aea75012baf437218258d34973c80b304e67d7acddd8576a
3+
EBUILD mytharchive-0.24.2_p20120221.ebuild 735 RMD160 885dbe6a1c1eae645bab8b12248b9de81a5b1da1 SHA1 fb019d7619037cd5584d541c6e9005c6918d9707 SHA256 de446bf049788a5e9d13b5acbb777e59aa0f68f2c6af48802ce7125c66655fb9
4+
EBUILD mytharchive-0.25_pre20120223.ebuild 753 RMD160 1b1a92d3c3e81b8940a520e677e4bad2b1b1a665 SHA1 c1a3e5d8dbee337198e88f2fd8090a5cf8b78555 SHA256 d54203bbdc328306ec086e8d0ae9eae6101c2e6fa0be93e40ea8f36b8c748a3c

‎Gentoo/media-plugins/mythnews/mythnews-0.24.1_p20120101.ebuild‎ renamed to ‎Gentoo/media-plugins/mytharchive/mytharchive-0.24.2_p20120221.ebuild‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,30 @@
44

55
EAPI="2"
66

7-
MYTHTV_VERSION="v0.24.1-118-gcfcea7a"
7+
MYTHTV_VERSION="v0.24.2-15-gc29d36f"
88
MYTHTV_BRANCH="fixes/0.24"
9-
MYTHTV_REV="cfcea7a40b14d7b856c5fa1c15092a05a89bc227"
10-
MYTHTV_SREV="cfcea7a"
9+
MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
10+
MYTHTV_SREV="c29d36f"
1111

1212
inherit mythtv-plugins
1313

1414
DESCRIPTION="Module for MythTV."
1515
IUSE=""
1616
KEYWORDS="amd64 x86 ~ppc"
1717

18-
RDEPEND=""
19-
DEPEND=""
18+
RDEPEND="
19+
>=dev-lang/python-2.5
20+
dev-python/mysql-python
21+
dev-python/imaging
22+
"
23+
24+
DEPEND="
25+
media-video/mjpegtools[png]
26+
media-video/dvdauthor
27+
app-cdr/dvd+rw-tools
28+
virtual/cdrtools
29+
media-video/transcode
30+
"
2031

2132
src_install() {
2233
mythtv-plugins_src_install

‎Gentoo/media-plugins/mytharchive/mytharchive-0.25_pre20120103.ebuild‎ renamed to ‎Gentoo/media-plugins/mytharchive/mytharchive-0.25_pre20120223.ebuild‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,29 @@
44

55
EAPI="2"
66

7-
MYTHTV_VERSION="v0.25pre-3996-gd354002"
7+
MYTHTV_VERSION="v0.25pre-4673-g89c34ef"
88
MYTHTV_BRANCH="master"
9-
MYTHTV_REV="d35400280da1bfd95c4d43df2b5a82516914ee0d"
10-
MYTHTV_SREV="d354002"
9+
MYTHTV_REV="89c34ef6b2e0e8688474ef546b799d54d8ec6242"
10+
MYTHTV_SREV="89c34ef"
1111

1212
inherit mythtv-plugins
1313

1414
DESCRIPTION="Module for MythTV."
1515
IUSE=""
1616
KEYWORDS="~amd64 ~x86 ~ppc"
1717

18-
RDEPEND=""
19-
DEPEND="dev-python/imaging
20-
media-video/dvdauthor"
18+
RDEPEND="
19+
|| ( media-tv/mythtv[python] media-tv/mythtv-bindings[python] )
20+
dev-python/imaging
21+
"
22+
23+
DEPEND="
24+
media-video/mjpegtools[png]
25+
media-video/dvdauthor
26+
app-cdr/dvd+rw-tools
27+
virtual/cdrtools
28+
media-video/transcode
29+
"
2130

2231
src_install() {
2332
mythtv-plugins_src_install

‎Gentoo/media-plugins/mythbrowser/Manifest‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AUX 6346.patch 104774 RMD160 9936e423739e4fdab8175970af7e2569f6101052 SHA1 566419f4cda05cca2e997eabda1ae14fd0495257 SHA256 943782aabc36949c326b2a19ce86ee9aca833a16a536c7eb48f4a6aa314f0069
2-
DIST mythtv-0.24.1_p20120101.tar.gz 69785145 RMD160 4d72249680e508b9c93947e081671c03ef16ec1e SHA1 a5c29a823d4e95c10d291c2296f9ca6d3785319b SHA256 b58d0959e3087f957ccff84fbcda6b1dce8be6f2c6e3ee6b243967c0fc61e6d4
3-
DIST mythtv-0.25_pre20120103.tar.gz 72742162 RMD160 443c53261c781faff7e58cbe20c910a8fa69a337 SHA1 c3428cf0069aa955702e0931e1c5be90d875d2af SHA256 b1d940ef673d0d8311cbcfede2d5d1ae65d1caf7bf7d2d1a01e1d92b10f35ff9
4-
EBUILD mythbrowser-0.24.1_p20120101.ebuild 631 RMD160 ba80ffc3d3e688ac0720ccbabe308fc10f04f34a SHA1 66474a96e7be942e9cd2893dcc0dfda093a73794 SHA256 706ed094dfa4928d5e30853646cf714a5290b5b8e96f5c175e3a9a91064d9410
5-
EBUILD mythbrowser-0.25_pre20120103.ebuild 631 RMD160 5faab34a30e98a91953c1a3d17b4e18ea342674e SHA1 d2bfc31bc012eb035fa97721cdf2f09cff723a4c SHA256 d28b73592e1802063d07d9c61e6096adf09cb140e5325725725fa0e7a9b7bf18
2+
DIST mythtv-0.24.2_p20120221.tar.gz 69787595 RMD160 8dea4dd4a2b68dc780b0a03061f46f5cbb30c8c8 SHA1 704b775aa771c8ddc2de8c6ef8cde39ab5a60da5 SHA256 d0e5addc219a33b0280c38c3db571846644fb6f73657e91fad43c344607b05ae
3+
DIST mythtv-0.25_pre20120223.tar.gz 72904164 RMD160 89a03e24452ec7e71914380d9ebf414b47f06801 SHA1 effafe5df5b652c4638719a82fc72b45ac22e5bf SHA256 332d1a96664139b1aea75012baf437218258d34973c80b304e67d7acddd8576a
4+
EBUILD mythbrowser-0.24.2_p20120221.ebuild 630 RMD160 01f7a0765278ac0a3df0d7664b9655bc52827ee1 SHA1 5f98a52dfc6bfee62bbd0a12106396fa5a6d1e9f SHA256 0b65890c6f88428c084dee80af11497c0a7b55c9f7730791cf00aadcac3d5ae5
5+
EBUILD mythbrowser-0.25_pre20120223.ebuild 631 RMD160 91d009bb04317c297a72b7b9fba9dde61c7589e7 SHA1 e4badfe75ceac1d3391cec82dfbd62d2e24289ca SHA256 8a21a06995b03c78a471251c89b5071f9b5a86ee2c946d36539719c5ea7e2d79

‎Gentoo/media-plugins/mythbrowser/mythbrowser-0.24.1_p20120101.ebuild‎ renamed to ‎Gentoo/media-plugins/mythbrowser/mythbrowser-0.24.2_p20120221.ebuild‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
EAPI="2"
66

7-
MYTHTV_VERSION="v0.24.1-118-gcfcea7a"
7+
MYTHTV_VERSION="v0.24.2-15-gc29d36f"
88
MYTHTV_BRANCH="fixes/0.24"
9-
MYTHTV_REV="cfcea7a40b14d7b856c5fa1c15092a05a89bc227"
10-
MYTHTV_SREV="cfcea7a"
9+
MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
10+
MYTHTV_SREV="c29d36f"
1111

1212
inherit mythtv-plugins eutils
1313

0 commit comments

Comments
 (0)