Search the plugins using multilib-generated path (lib/lib32/lib64). See Bug #136605...
authorMatthias Schwarzott <zzam@gentoo.org>
Sat, 17 Jun 2006 14:55:13 +0000 (14:55 +0000)
committerMatthias Schwarzott <zzam@gentoo.org>
Sat, 17 Jun 2006 14:55:13 +0000 (14:55 +0000)
Package-Manager: portage-2.1.1_pre1

media-video/vdr/ChangeLog
media-video/vdr/Manifest
media-video/vdr/files/digest-vdr-1.4.1-r1 [new file with mode: 0644]
media-video/vdr/vdr-1.4.1-r1.ebuild [new file with mode: 0644]

index 224d52bd85e492f25bc8bb7f5eef2dcf61c1102a..34d9b4700a56cd6763bd877ce1e58bb232667695 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.63 2006/06/13 06:04:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.64 2006/06/17 14:55:13 zzam Exp $
+
+*vdr-1.4.1-r1 (17 Jun 2006)
+
+  17 Jun 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.1-r1.ebuild:
+  Search the plugins using multilib-generated path (lib/lib32/lib64). See Bug
+  #136605. Moved capability file to /usr/share.
 
 *vdr-1.4.1 (13 Jun 2006)
 
index c958307c8412b6a82de7e9194133381a5649f894..0e3ec3528b546796989279a7794a7bc694837d0d 100644 (file)
@@ -151,14 +151,18 @@ EBUILD vdr-1.4.0.ebuild 5941 RMD160 cf20b797e5bb62b4bf7fbdfaff76d5b0a1e87d96 SHA
 MD5 71ba04249f3f2b9d6eeecfd4f04ac3f8 vdr-1.4.0.ebuild 5941
 RMD160 cf20b797e5bb62b4bf7fbdfaff76d5b0a1e87d96 vdr-1.4.0.ebuild 5941
 SHA256 afa281ac718c9476e9d55850b7bb907dde3d1e4fc637fce52b59ffb2844f81db vdr-1.4.0.ebuild 5941
+EBUILD vdr-1.4.1-r1.ebuild 6185 RMD160 dc2154fddc06a578ce7e5aeefd055b1190b2e891 SHA1 17feabd5f76a4ff98fbddfe552d3e651c46f9334 SHA256 84723473f89c6dddaa407e9701ec70d356e90e67cbba0a750440e73e4cd9feb8
+MD5 8c5f1c6a5d4d90d7d3d77c2c069ca790 vdr-1.4.1-r1.ebuild 6185
+RMD160 dc2154fddc06a578ce7e5aeefd055b1190b2e891 vdr-1.4.1-r1.ebuild 6185
+SHA256 84723473f89c6dddaa407e9701ec70d356e90e67cbba0a750440e73e4cd9feb8 vdr-1.4.1-r1.ebuild 6185
 EBUILD vdr-1.4.1.ebuild 6163 RMD160 418878997bb7883c9e4af559edfe6ce16a431900 SHA1 e5cbe454697de9e1dd7a89065830e7af00c1f83a SHA256 70caf501e58f21feff88ca43ab3ec5d0b863e4d2daadd4253f889b06fa5ea229
 MD5 274915c640202c2bc78e2d961d4a3c63 vdr-1.4.1.ebuild 6163
 RMD160 418878997bb7883c9e4af559edfe6ce16a431900 vdr-1.4.1.ebuild 6163
 SHA256 70caf501e58f21feff88ca43ab3ec5d0b863e4d2daadd4253f889b06fa5ea229 vdr-1.4.1.ebuild 6163
-MISC ChangeLog 9523 RMD160 2497ec0f9a02b88e6214d0946a8a71a7b5f021a2 SHA1 d4c63415b675bea894d460f7dfb6f44a423bf3c9 SHA256 216c38f34b5ae48730ec010e104fdcb15377b805cb6f18a180001ae88a8c0f66
-MD5 61eae7b5c14c19c6661b6a9273ad22e6 ChangeLog 9523
-RMD160 2497ec0f9a02b88e6214d0946a8a71a7b5f021a2 ChangeLog 9523
-SHA256 216c38f34b5ae48730ec010e104fdcb15377b805cb6f18a180001ae88a8c0f66 ChangeLog 9523
+MISC ChangeLog 9754 RMD160 97a0db792071f658acd3d301cb0093dbb853bb4d SHA1 e4cc8dbce329f804993852d991ade6a6a52352f1 SHA256 a4d811600de951920e5dfa75093118ab15c74f12782485a05020bdf0d8e36aa1
+MD5 4186c1ab98e6e8371e6d4ed1b1df2604 ChangeLog 9754
+RMD160 97a0db792071f658acd3d301cb0093dbb853bb4d ChangeLog 9754
+SHA256 a4d811600de951920e5dfa75093118ab15c74f12782485a05020bdf0d8e36aa1 ChangeLog 9754
 MISC metadata.xml 259 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 SHA1 71c8f0604523f99ac8b7849a01d861d721a191fd SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
@@ -217,10 +221,13 @@ SHA256 32fbea788c5fe10fd98e01fbae2a6a1bc994af4c0ccd26e451b1d08c80bf9f91 files/di
 MD5 41c048fc2621ae4875a60141b501e5ad files/digest-vdr-1.4.1 518
 RMD160 adff5c10ff7c7d15701d94654fe79ad259b666ff files/digest-vdr-1.4.1 518
 SHA256 5e00cf88de45cdb3fdb2e6ec985f53821b7e467a58e54bb22536d5336ede3247 files/digest-vdr-1.4.1 518
+MD5 41c048fc2621ae4875a60141b501e5ad files/digest-vdr-1.4.1-r1 518
+RMD160 adff5c10ff7c7d15701d94654fe79ad259b666ff files/digest-vdr-1.4.1-r1 518
+SHA256 5e00cf88de45cdb3fdb2e6ec985f53821b7e467a58e54bb22536d5336ede3247 files/digest-vdr-1.4.1-r1 518
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEjlWJZfSl1Kp5KmoRAhJ1AJ9wqbg9yOqMLfTbc51otg4+5tOSdACgg3Zc
-MtFZUh+nwAa+MXp/6zOaIyI=
-=QqaH
+iD8DBQFElBfcZfSl1Kp5KmoRAhguAJ4m4n/UG3EyFuLaXW9TqIR0ekVsxgCfZTHL
+NmEl8U6NUYGhhwGV97yK3RU=
+=Dwj8
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.1-r1 b/media-video/vdr/files/digest-vdr-1.4.1-r1
new file mode 100644 (file)
index 0000000..92b6864
--- /dev/null
@@ -0,0 +1,6 @@
+MD5 167e5afd679864b00d19ecbd61722056 gentoo-vdr-patchset-1.4.1-1.tar.bz2 197293
+RMD160 1d5a8d8d9425918e845a6eee7de7ad755244886e gentoo-vdr-patchset-1.4.1-1.tar.bz2 197293
+SHA256 f99c7c45699483e3bd8e6a7cf83df609c6af74020b916aaa3c0663694f2ab933 gentoo-vdr-patchset-1.4.1-1.tar.bz2 197293
+MD5 f17ab7d185f3c5426cc713c2ad4cc708 vdr-1.4.1.tar.bz2 553580
+RMD160 d23eef3bce7e0604051633f8f93c39e7b046bd9b vdr-1.4.1.tar.bz2 553580
+SHA256 a4595c6a5d5f3008e93062444f8b69ca1bec2c977cc536f650c31418164722c7 vdr-1.4.1.tar.bz2 553580
diff --git a/media-video/vdr/vdr-1.4.1-r1.ebuild b/media-video/vdr/vdr-1.4.1-r1.ebuild
new file mode 100644 (file)
index 0000000..02e93a3
--- /dev/null
@@ -0,0 +1,271 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1-r1.ebuild,v 1.1 2006/06/17 14:55:13 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+IUSE="debug vanilla aio bigpatch jumpplay dvbplayer lnbsharing sourcecaps cmdsubmenu"
+IUSE="${IUSE} child-protection yaepg setup-plugin submenu subtitles rotor"
+
+PATCHSET_V=1
+PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.cadsoft.de/vdr/"
+SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
+       !vanilla? ( mirror://gentoo/${PATCHSET_NAME}.tar.bz2
+                               http://dev.gentoo.org/~zzam/distfiles/${PATCHSET_NAME}.tar.bz2 )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+
+DEPEND="media-libs/jpeg
+       sys-apps/gawk
+       media-tv/linuxtv-dvb-headers
+       sys-libs/libcap"
+
+RDEPEND="${DEPEND}
+       dev-lang/perl
+       media-tv/vdrplugin-rebuild
+       !vanilla? ( >=media-tv/gentoo-vdr-scripts-0.3.5 )"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+
+pkg_setup() {
+       use debug && append-flags -g
+}
+
+add_cap() {
+       while [ "$1" ]; do
+               CAPS="${CAPS}\n$1=1"
+               shift
+       done
+}
+
+# works like use to check for active (and not active !abc) useflags
+# if more than one flag is given it returns that all flags are active
+#
+# "use_multi_and a b !c !d"
+# ==
+# "use a && use b && use !c && use !d"
+#
+use_multi_and() {
+       while [[ -n ${1} ]]; do
+               use ${1} || return 1
+
+               shift
+       done
+       return 0
+}
+
+# reads the line GENTOO_USE out of the beginning of the patch
+# example: GENTOO_USE: aio !bigpatch
+# and checks weather the useflags are set appropriate (via use_multi_and)
+# if check returns true the patch is applied
+#
+apply_vdr_patch() {
+       local APPLY=0
+       local COUNT_USE=0
+       local CAP=""
+       local p="${1}"
+       debug-print "PATCH:"
+       debug-print "  $(basename ${p})"
+       local V1
+       local V2
+       while read V1 V2; do
+               case ${V1} in
+               GENTOO_USE:)
+                       : $((COUNT_USE++))
+                       if use_multi_and ${V2}; then
+                               APPLY=1
+                       fi
+                       ;;
+               GENTOO_CAP:)
+                       CAP="${V2}"
+                       ;;
+               +++|---|diff|@@)
+                       break;
+                       ;;
+               *)
+                       ;;
+               esac
+       done < "${p}"
+       if [[ ${COUNT_USE} -eq 0 ]]; then
+               APPLY=1
+       fi
+       [[ ${APPLY} == 0 ]] && return
+       debug-print "    --> applied"
+       epatch "${p}"
+       [[ -n "${CAP}" ]] && add_cap ${CAP}
+}
+
+# call apply_vdr_patch for all patchfiles in given directory
+
+apply_vdr_patchset() {
+       local p
+       for p in ${1}/*.{diff,patch}; do
+               [[ -f "${p}" ]] || continue
+               apply_vdr_patch "${p}"
+       done
+}
+
+src_unpack() {
+       unpack ${P}.tar.bz2
+       if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+               ewarn "Using local developer patchset."
+               PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+       else
+               unpack ${PATCHSET_NAME}.tar.bz2
+               PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+       fi
+
+       cd ${S}
+
+       ebegin "Changing pathes for gentoo"
+       sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
+
+       sed \
+         -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
+         -i vdr.c
+
+       cat > Make.config <<-EOT
+               #
+               # Generated by ebuild ${PF}
+               #
+               DVBDIR           = ${DVB_DIR}
+               PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
+               CONFIGDIR        = ${CONF_DIR}
+
+               DEFINES         += -DCONFIGDIR=\"\$(CONFIGDIR)\"
+       EOT
+       eend 0
+
+       if use vanilla; then
+               ewarn "OK - You are on your own now!"
+               ewarn "no gentoo-patches will be applied!"
+       else
+               apply_vdr_patchset ${PATCHSET_DIR}
+
+               if use setup-plugin && use submenu; then
+                       ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
+               fi
+       fi
+
+       # apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
+       if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
+               echo
+               einfo "Applying local patches"
+               for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{diff,patch}; do
+                       test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
+               done
+       fi
+
+       if [[ -n "${VDRSOURCE_DIR}" ]]; then
+               cp -r ${S} ${T}/source-tree
+       fi
+
+
+       if ! use vanilla; then
+               add_cap CAP_IRCTRL_RUNTIME_PARAM \
+                       CAP_VFAT_RUNTIME_PARAM \
+                       CAP_SHUTDOWN_SVDRP \
+                       CAP_CHUID
+
+               echo -e ${CAPS} > ${CAP_FILE}
+       fi
+}
+
+src_install() {
+       exeinto /usr/bin
+       doexe vdr
+       doexe svdrpsend.pl
+
+       insinto ${VDR_INCLUDE_DIR}
+       doins *.h
+       doins Make.config
+
+       insinto ${VDR_INCLUDE_DIR}/libsi
+       doins libsi/*.h
+
+       keepdir ${CONF_DIR}/plugins
+       keepdir ${CONF_DIR}/themes
+
+       insinto ${CONF_DIR}
+       doins *.conf channels.conf.*
+
+       keepdir "${PLUGIN_LIB_DIR}"
+
+       doman vdr.1 vdr.5
+
+       dohtml *.html
+       dodoc MANUAL INSTALL README* HISTORY*
+       dodoc TODO-enAIO-rm CONTRIBUTORS
+
+       insinto /usr/share/vdr
+       doins ${CAP_FILE}
+
+       if [[ -n "${VDRSOURCE_DIR}" ]]; then
+               einfo "Installing sources"
+               insinto ${VDRSOURCE_DIR}/${P}
+               doins -r ${T}/source-tree/*
+               keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
+       fi
+
+       if use setup-plugin; then
+               insinto /usr/share/vdr/setup
+               doins ${S}/menu.c
+
+               insinto /etc/vdr/plugins/setup
+               newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
+       fi
+       chown -R vdr:vdr ${D}/${CONF_DIR}
+}
+
+pkg_postinst() {
+       einfo "It is a good idea to run vdrplugin-rebuild now"
+       if has_version "<media-video/vdr-1.3.36-r3"; 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-plugin; then
+               echo
+               eerror "It is very important to emerge media-plugins/vdr-setup now"
+               eerror "and to have it activated in /etc/conf.de/vdr PLUGINS=\"\""
+       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_jeys}; 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
+}