* [gentoo-commits] gentoo-x86 commit in media-video/vdr: vdr-1.6.0_p2-r7.ebuild ChangeLog
@ 2011-10-23 15:50 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 5+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2011-10-23 15:50 UTC (permalink / raw
To: gentoo-commits
hd_brummy 11/10/23 15:50:05
Modified: ChangeLog
Added: vdr-1.6.0_p2-r7.ebuild
Log:
eapi=4; removed tinyxml bundle, use now externel tinyxml lib; keyword ~arm droped; removed dxr3 patch, updated vdr-dxr3 dont need the patch anymore
(Portage version: 2.1.10.11/cvs/Linux i686, RepoMan options: --force)
Revision Changes Path
1.148 media-video/vdr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.148&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.148&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?r1=1.147&r2=1.148
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- ChangeLog 22 Oct 2011 19:02:14 -0000 1.147
+++ ChangeLog 23 Oct 2011 15:50:05 -0000 1.148
@@ -1,6 +1,13 @@
# ChangeLog for media-video/vdr
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.147 2011/10/22 19:02:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.148 2011/10/23 15:50:05 hd_brummy Exp $
+
+*vdr-1.6.0_p2-r7 (23 Oct 2011)
+
+ 23 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-1.6.0_p2-r7.ebuild,
+ +files/vdr-1.6.0-shared-tinyxml.diff:
+ eapi=4; removed tinyxml bundle, use now externel tinyxml lib; keyword ~arm
+ droped; removed dxr3 patch, updated vdr-dxr3 dont need the patch anymore
22 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r6.ebuild:
keyworded ~arm
1.1 media-video/vdr/vdr-1.6.0_p2-r7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.1&content-type=text/plain
Index: vdr-1.6.0_p2-r7.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.1 2011/10/23 15:50:05 hd_brummy Exp $
EAPI="4"
inherit eutils flag-o-matic multilib
# Switches supported by extensions-patch
EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
rotor settime setup sortrecords sourcecaps livebuffer
ttxtsubs timercmd timerinfo validinput yaepg
syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
volctrl wareagleicon lircsettings deltimeshiftrec em84xx
cmdreccmdi18n softosd parentalrating"
# names of the use-flags
EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
# names ext-patch uses internally, here only used for maintainer checks
EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
MY_PV="${PV%_p*}"
MY_P="${PN}-${MY_PV}"
S="${WORKDIR}/${MY_P}"
EXT_V="72"
EXT_P=VDR-Extensions-Patch-${EXT_V}
EXT_DIR=${WORKDIR}/${EXT_P}/
EXT_VDR_PV="${PV/_p/-}"
DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
HOMEPAGE="http://www.tvdr.de/"
SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
LICENSE="GPL-2"
COMMON_DEPEND="virtual/jpeg
sys-libs/libcap
>=media-libs/fontconfig-2.4.2
>=media-libs/freetype-2
sys-devel/gettext
dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
DEPEND="${COMMON_DEPEND}
~media-tv/linuxtv-dvb-headers-5
dev-util/unifdef
setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
RDEPEND="${COMMON_DEPEND}
dev-lang/perl
>=media-tv/gentoo-vdr-scripts-0.4.5
media-fonts/corefonts"
# pull in vdr-setup to get the xml files, else menu will not work
PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r4 )
dxr3? ( >=media-plugins/vdr-dxr3-0.2.12 ) "
CONF_DIR=/etc/vdr
CAP_FILE=${S}/capabilities.sh
CAPS="# Capabilities of the vdr-executable for use by startscript etc."
pkg_setup() {
check_menu_flags
use debug && append-flags -g
PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
}
check_menu_flags() {
if use menuorg && use setup; then
echo
eerror "Please use only one of this USE-Flags"
eerror "\tmenuorg setup"
die "multiple menu manipulation"
fi
}
add_cap() {
local arg
for arg; do
CAPS="${CAPS}\n${arg}=1"
done
}
enable_patch() {
local arg ARG_UPPER
for arg; do
ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
echo "${ARG_UPPER} = 1" >> Make.config
done
}
extensions_add_make_conf()
{
# copy all ifdef for extensions-patch to Make.config
sed -e '1,/need to touch the following:/d' \
-e '/ifdef DVBDIR/,/^$/d' \
Make.config.template >> Make.config
}
extensions_all_defines() {
# extract all possible settings for extensions-patch
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
Make.config.template \
| sort \
| tr '[:upper:]' '[:lower:]'
}
extensions_all_defines_unset() {
# extract all possible settings for extensions-patch
# and convert them to -U... for unifdef
sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
Make.config.template \
| tr '\n' ' '
}
do_unifdef() {
ebegin "Unifdef sources"
local mf="Makefile.get"
cat <<'EOT' > $mf
include Makefile
show_def:
@echo $(DEFINES)
show_src_files:
@echo $(OBJS:%.o=%.c)
EOT
local DEFINES=$(extensions_all_defines_unset)
local RAW_DEFINES=$(make -f "$mf" show_def)
local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
local KEEP_FILES=""
rm "$mf"
local def
for def in $RAW_DEFINES; do
case "${def}" in
-DUSE*)
DEFINES="${DEFINES} ${def}"
;;
esac
done
local f
for f in *.c; do
# Removing the src files the Makefile does not use for compiling vdr
if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
rm -f ${f} ${f%.c}.h
continue
fi
unifdef ${DEFINES} "$f" > "tmp.$f"
mv "tmp.$f" "$f"
done
for f in *.h; do
unifdef ${DEFINES} "$f" > "tmp.$f"
mv "tmp.$f" "$f"
[[ -s $f ]] || rm "$f"
done
eend 0
}
src_prepare() {
#applying maintainace-patches
epatch "${DISTDIR}/${MY_P}-1.diff"
epatch "${DISTDIR}/${MY_P}-2.diff"
epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
epatch "${FILESDIR}"/vdr-1.6.0-ldflags.patch
epatch "${FILESDIR}"/vdr-1.6.0-use-v4l2.patch
ebegin "Changing pathes for gentoo"
sed \
-e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
-i vdr.c
local DVBDIR=/usr/include
cat > Make.config <<-EOT
#
# Generated by ebuild ${PF}
#
PREFIX = /usr
DVBDIR = ${DVBDIR}
PLUGINLIBDIR = ${PLUGIN_LIBDIR}
CONFDIR = ${CONF_DIR}
VIDEODIR = /var/vdr/video
LOCDIR = \$(PREFIX)/share/locale
DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
INCLUDES += -I\$(DVBDIR)
EOT
eend 0
epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
sed -i i18n-to-gettext.pl \
-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
# Do not install runvdr script and plugins
sed -i Makefile \
-e 's/runvdr//' \
-e 's/ install-plugins//'
if use vanilla; then
epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
else
cd "${S}"
# Now apply extensions patch
local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
epatch "${fname}"
# Fix typo in Make.config.template
sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
# other gentoo patches
# epatch "${FILESDIR}/..."
epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
# This allows us to start even if some plugin does not exist
# or is not loadable.
enable_patch PLUGINMISSING
# Patch necessary for media-plugins/vdr-reelchannelscan
# it does not change anything when plugin is not used
enable_patch CHANNELSCAN
if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
einfo "Doing maintainer checks:"
# these patches we do not support
# (or have them already hard enabled)
local IGNORE_PATCHES="channelscan pluginapi pluginmissing streamdevext"
extensions_all_defines > "${T}"/new.IUSE
echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
$IGNORE_PATCHES | \
tr ' ' '\n' |sort > "${T}"/old.IUSE
local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
if [[ -z ${DIFFS} ]]; then
einfo "EXT_PATCH_FLAGS is up to date."
else
ewarn "IUSE differences!"
local diff
for diff in $DIFFS; do
ewarn "$diff"
done
fi
fi
ebegin "Enabling selected patches"
local flag
for flag in $EXT_PATCH_FLAGS; do
use $flag && enable_patch ${flag}
done
# patches that got renamed
use iptv && enable_patch pluginparam
use liemikuutio && enable_patch liemiext
eend 0
extensions_add_make_conf
ebegin "Make depend"
emake .dependencies >/dev/null
eend $? "make depend failed"
[[ -z "$NO_UNIFDEF" ]] && do_unifdef
use iptv && sed -i sources.conf -e 's/^#P/P/'
fi
# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
local dir_tmp_var
local LOCALPATCHES_SUBDIR=${PV}
for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
LOCALPATCHES_SUBDIR="${dir_tmp_var}"
fi
done
echo
if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
einfo "Applying local patches"
else
einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
fi
for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
done
fi
if [[ -n "${VDRSOURCE_DIR}" ]]; then
cp -r "${S}" "${T}"/source-tree
fi
add_cap CAP_UTF8
add_cap CAP_IRCTRL_RUNTIME_PARAM \
CAP_VFAT_RUNTIME_PARAM \
CAP_CHUID \
CAP_SHUTDOWN_AUTO_RETRY
echo -e ${CAPS} > "${CAP_FILE}"
}
src_install() {
# trick makefile not to create a videodir by supplying it with an existing
# directory
emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
keepdir "${CONF_DIR}"/plugins
keepdir "${CONF_DIR}"/themes
keepdir "${PLUGIN_LIBDIR}"
exeinto /usr/share/vdr/bin
doexe i18n-to-gettext.pl
dohtml *.html
dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
local f
rm *vdr-1.4* 2>/dev/null
for f in *; do
[[ -f ${f} ]] || continue
newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
done
cd "${S}"
insinto /usr/share/vdr
doins "${CAP_FILE}"
if [[ -n "${VDRSOURCE_DIR}" ]]; then
local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
einfo "Installing sources"
insinto "${SOURCES_DEST}"
doins -r "${T}"/source-tree/*
keepdir "${SOURCES_DEST}"/PLUGINS/lib
fi
if use setup; then
insinto /usr/share/vdr/setup
doins "${S}"/menu.c
fi
chown -R vdr:vdr "${D}/${CONF_DIR}"
}
pkg_preinst() {
has_version "<${CATEGORY}/${PN}-1.3.36-r3"
previous_less_than_1_3_36_r3=$?
has_version "<${CATEGORY}/${PN}-1.6.0"
previous_less_than_1_6_0=$?
}
pkg_postinst() {
elog "It is a good idea to run vdrplugin-rebuild now."
if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
ewarn "Upgrade Info:"
ewarn
ewarn "If you had used the use-flags lirc, rcu or vfat"
ewarn "then, you now have to enable the associated functionality"
ewarn "in /etc/conf.d/vdr"
ewarn
ewarn "vfat is now set with VFAT_FILENAMES."
ewarn "lirc/rcu are now set with IR_CTRL."
ebeep
fi
if use setup; then
if ! has_version media-plugins/vdr-setup || \
! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
echo
ewarn "You have compiled media-video/vdr with USE=\"setup\""
ewarn "It is very important to emerge media-plugins/vdr-setup now!"
ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
fi
fi
local keysfound=0
local key
local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
local remote_file="${ROOT}"/etc/vdr/remote.conf
if [[ -e ${remote_file} ]]; then
for key in ${warn_keys}; do
if grep -q -i "\.${key} " "${remote_file}"; then
keysfound=1
break
fi
done
if [[ ${keysfound} == 1 ]]; then
ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
ewarn "Please remove these keys or vdr will not start:"
ewarn "# ${warn_keys}"
fi
fi
if use atsc; then
ewarn "ATSC is only supported by a rudimentary patch"
einfo "and need at least this patch and a plugin installed"
einfo "emerge media-plugins/vdr-atscepg"
fi
if [[ $previous_less_than_1_6_0 = 0 ]]; then
elog "By default vdr is now started with utf8 character encoding"
elog
elog "To rename the old recordings to utf8 conforming names, do this:"
elog "\temerge app-text/convmv"
elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
elog
elog "To fix the descriptions of your recordings do this:"
elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
fi
elog "To get nice symbols in OSD we recommend to install"
elog "\t1. emerge media-fonts/vdrsymbols-ttf"
elog "\t2. select font VDRSymbolsSans in Setup"
elog ""
elog "To get an idea how to proceed now, have a look at our vdr-guide:"
elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/vdr: vdr-1.6.0_p2-r7.ebuild ChangeLog
@ 2011-10-24 17:45 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 5+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2011-10-24 17:45 UTC (permalink / raw
To: gentoo-commits
hd_brummy 11/10/24 17:45:10
Modified: vdr-1.6.0_p2-r7.ebuild ChangeLog
Log:
keyworded ~arm
(Portage version: 2.1.10.11/cvs/Linux i686, RepoMan options: --force)
Revision Changes Path
1.2 media-video/vdr/vdr-1.6.0_p2-r7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?r1=1.1&r2=1.2
Index: vdr-1.6.0_p2-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-1.6.0_p2-r7.ebuild 23 Oct 2011 15:50:05 -0000 1.1
+++ vdr-1.6.0_p2-r7.ebuild 24 Oct 2011 17:45:10 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.1 2011/10/23 15:50:05 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.2 2011/10/24 17:45:10 hd_brummy Exp $
EAPI="4"
@@ -40,7 +40,7 @@
ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
SLOT="0"
LICENSE="GPL-2"
1.149 media-video/vdr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.149&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.149&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?r1=1.148&r2=1.149
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- ChangeLog 23 Oct 2011 15:50:05 -0000 1.148
+++ ChangeLog 24 Oct 2011 17:45:10 -0000 1.149
@@ -1,6 +1,9 @@
# ChangeLog for media-video/vdr
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.148 2011/10/23 15:50:05 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.149 2011/10/24 17:45:10 hd_brummy Exp $
+
+ 24 Oct 2011; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r7.ebuild:
+ keyworded ~arm
*vdr-1.6.0_p2-r7 (23 Oct 2011)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/vdr: vdr-1.6.0_p2-r7.ebuild ChangeLog
@ 2012-01-17 19:08 Christian Ruppert (idl0r)
0 siblings, 0 replies; 5+ messages in thread
From: Christian Ruppert (idl0r) @ 2012-01-17 19:08 UTC (permalink / raw
To: gentoo-commits
idl0r 12/01/17 19:08:17
Modified: vdr-1.6.0_p2-r7.ebuild ChangeLog
Log:
Adjust media-tv/linuxtv-dvb-headers depdency
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.3 media-video/vdr/vdr-1.6.0_p2-r7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?r1=1.2&r2=1.3
Index: vdr-1.6.0_p2-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-1.6.0_p2-r7.ebuild 24 Oct 2011 17:45:10 -0000 1.2
+++ vdr-1.6.0_p2-r7.ebuild 17 Jan 2012 19:08:17 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.2 2011/10/24 17:45:10 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.3 2012/01/17 19:08:17 idl0r Exp $
EAPI="4"
@@ -52,7 +52,7 @@
dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
DEPEND="${COMMON_DEPEND}
- ~media-tv/linuxtv-dvb-headers-5
+ =media-tv/linuxtv-dvb-headers-5*
dev-util/unifdef
setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
1.151 media-video/vdr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?r1=1.150&r2=1.151
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog 12 Nov 2011 13:22:02 -0000 1.150
+++ ChangeLog 17 Jan 2012 19:08:17 -0000 1.151
@@ -1,6 +1,9 @@
# ChangeLog for media-video/vdr
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.150 2011/11/12 13:22:02 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.151 2012/01/17 19:08:17 idl0r Exp $
+
+ 17 Jan 2012; Christian Ruppert <idl0r@gentoo.org> vdr-1.6.0_p2-r7.ebuild:
+ Adjust media-tv/linuxtv-dvb-headers depdency
12 Nov 2011; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.6.0_p2.ebuild,
-vdr-1.6.0_p2-r2.ebuild, -vdr-1.6.0_p2-r3.ebuild, -vdr-1.6.0_p2-r4.ebuild,
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/vdr: vdr-1.6.0_p2-r7.ebuild ChangeLog
@ 2012-02-16 14:55 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 5+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2012-02-16 14:55 UTC (permalink / raw
To: gentoo-commits
hd_brummy 12/02/16 14:55:49
Modified: vdr-1.6.0_p2-r7.ebuild ChangeLog
Log:
ecommit
(Portage version: 2.1.10.11/cvs/Linux i686)
Revision Changes Path
1.5 media-video/vdr/vdr-1.6.0_p2-r7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?r1=1.4&r2=1.5
Index: vdr-1.6.0_p2-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdr-1.6.0_p2-r7.ebuild 15 Feb 2012 17:57:39 -0000 1.4
+++ vdr-1.6.0_p2-r7.ebuild 16 Feb 2012 14:55:48 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.4 2012/02/15 17:57:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.5 2012/02/16 14:55:48 hd_brummy Exp $
EAPI="4"
@@ -44,6 +44,9 @@
SLOT="0"
LICENSE="GPL-2"
+REQUIRED_USE="setup? ( !menuorg )
+ menuorg? ( !setup )"
+
COMMON_DEPEND="virtual/jpeg
sys-libs/libcap
>=media-libs/fontconfig-2.4.2
@@ -63,28 +66,17 @@
# pull in vdr-setup to get the xml files, else menu will not work
PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r4 )
- dxr3? ( >=media-plugins/vdr-dxr3-0.2.12 ) "
+ dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 ) "
CONF_DIR=/etc/vdr
CAP_FILE=${S}/capabilities.sh
CAPS="# Capabilities of the vdr-executable for use by startscript etc."
pkg_setup() {
- check_menu_flags
-
use debug && append-flags -g
PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
}
-check_menu_flags() {
- if use menuorg && use setup; then
- echo
- eerror "Please use only one of this USE-Flags"
- eerror "\tmenuorg setup"
- die "multiple menu manipulation"
- fi
-}
-
add_cap() {
local arg
for arg; do
1.153 media-video/vdr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?r1=1.152&r2=1.153
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog 15 Feb 2012 17:57:39 -0000 1.152
+++ ChangeLog 16 Feb 2012 14:55:48 -0000 1.153
@@ -1,6 +1,9 @@
# ChangeLog for media-video/vdr
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.152 2012/02/15 17:57:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.153 2012/02/16 14:55:48 hd_brummy Exp $
+
+ 16 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r7.ebuild:
+ ecommit fixed depend vdr-dxr3 version, changed use-flag check to REQUIRED_USE
15 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r6.ebuild,
vdr-1.6.0_p2-r7.ebuild:
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/vdr: vdr-1.6.0_p2-r7.ebuild ChangeLog
@ 2012-02-16 17:32 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 5+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2012-02-16 17:32 UTC (permalink / raw
To: gentoo-commits
hd_brummy 12/02/16 17:32:33
Modified: vdr-1.6.0_p2-r7.ebuild ChangeLog
Log:
stable x86 amd64
(Portage version: 2.1.10.11/cvs/Linux i686)
Revision Changes Path
1.6 media-video/vdr/vdr-1.6.0_p2-r7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild?r1=1.5&r2=1.6
Index: vdr-1.6.0_p2-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr-1.6.0_p2-r7.ebuild 16 Feb 2012 14:55:48 -0000 1.5
+++ vdr-1.6.0_p2-r7.ebuild 16 Feb 2012 17:32:33 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.5 2012/02/16 14:55:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r7.ebuild,v 1.6 2012/02/16 17:32:33 hd_brummy Exp $
EAPI="4"
@@ -40,7 +40,7 @@
ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
+KEYWORDS="~arm amd64 ~ppc x86"
SLOT="0"
LICENSE="GPL-2"
@@ -55,7 +55,7 @@
dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
DEPEND="${COMMON_DEPEND}
- =virtual/linuxtv-dvb-headers-5*
+ >=virtual/linuxtv-dvb-headers-5
dev-util/unifdef
setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
@@ -66,7 +66,7 @@
# pull in vdr-setup to get the xml files, else menu will not work
PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r4 )
- dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 ) "
+ dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
CONF_DIR=/etc/vdr
CAP_FILE=${S}/capabilities.sh
1.154 media-video/vdr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/ChangeLog?r1=1.153&r2=1.154
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 16 Feb 2012 14:55:48 -0000 1.153
+++ ChangeLog 16 Feb 2012 17:32:33 -0000 1.154
@@ -1,6 +1,9 @@
# ChangeLog for media-video/vdr
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.153 2012/02/16 14:55:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.154 2012/02/16 17:32:33 hd_brummy Exp $
+
+ 16 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r7.ebuild:
+ stable x86 amd64
16 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r7.ebuild:
ecommit fixed depend vdr-dxr3 version, changed use-flag check to REQUIRED_USE
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-02-16 17:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-17 19:08 [gentoo-commits] gentoo-x86 commit in media-video/vdr: vdr-1.6.0_p2-r7.ebuild ChangeLog Christian Ruppert (idl0r)
-- strict thread matches above, loose matches on Subject: below --
2012-02-16 17:32 Joerg Bornkessel (hd_brummy)
2012-02-16 14:55 Joerg Bornkessel (hd_brummy)
2011-10-24 17:45 Joerg Bornkessel (hd_brummy)
2011-10-23 15:50 Joerg Bornkessel (hd_brummy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox