From: Matthias Schwarzott Date: Fri, 19 Jan 2007 23:36:11 +0000 (+0000) Subject: No longer install modules already provided by dependencies, and added URI to depend... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a911778b6b71974f237591270d446804c1ab7978;p=gentoo.git No longer install modules already provided by dependencies, and added URI to depend, makes creating initial config no longer fail (and if, then die), thanks to Sebastian Kemper . Package-Manager: portage-2.1.2-r1 --- diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog index 49813ba3231b..02404eda2ff4 100644 --- a/net-www/vdradmin-am/ChangeLog +++ b/net-www/vdradmin-am/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-www/vdradmin-am # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.10 2007/01/06 14:53:38 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.11 2007/01/19 23:36:11 zzam Exp $ + +*vdradmin-am-3.5.2-r1 (19 Jan 2007) + + 19 Jan 2007; Matthias Schwarzott + +vdradmin-am-3.5.2-r1.ebuild: + No longer install modules already provided by dependencies, and added URI to + depend, makes creating initial config no longer fail (and if, then die), + thanks to Sebastian Kemper . 06 Jan 2007; Matthias Schwarzott vdradmin-am-3.4.6.ebuild, vdradmin-am-3.4.7.ebuild, diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest index 1eb29a710861..2bf1f2ae39f6 100644 --- a/net-www/vdradmin-am/Manifest +++ b/net-www/vdradmin-am/Manifest @@ -46,14 +46,18 @@ EBUILD vdradmin-am-3.5.1.ebuild 4582 RMD160 24abb25ffb0e06ebabd9415cc93471fac39c MD5 901bc1ce47084128289ca79a661eff4b vdradmin-am-3.5.1.ebuild 4582 RMD160 24abb25ffb0e06ebabd9415cc93471fac39ce189 vdradmin-am-3.5.1.ebuild 4582 SHA256 38b205b85afb3e586dd04e9215f2516b09e64182008ad08f2f2d735380714259 vdradmin-am-3.5.1.ebuild 4582 +EBUILD vdradmin-am-3.5.2-r1.ebuild 4785 RMD160 83c905c3272de6c290bcaff597bb182e243f1f5f SHA1 d35597e033ce24dcd15b58f36d58071e4e5c2670 SHA256 665d7b17e6dd2c32129ebdd0188a72e353b694ffde90e15d9131e79701d7cbb8 +MD5 49807be678c3db2f7686ab4e4603e7fb vdradmin-am-3.5.2-r1.ebuild 4785 +RMD160 83c905c3272de6c290bcaff597bb182e243f1f5f vdradmin-am-3.5.2-r1.ebuild 4785 +SHA256 665d7b17e6dd2c32129ebdd0188a72e353b694ffde90e15d9131e79701d7cbb8 vdradmin-am-3.5.2-r1.ebuild 4785 EBUILD vdradmin-am-3.5.2.ebuild 4582 RMD160 f3872096b510e5c8ecc20e98be0e9a6572baf2bf SHA1 04816443c51df1d7daf602a4d9ecc375c69cb48f SHA256 f65f5bb80963132ab0239728eab22dfea0172477e9e8eb7b6cdbeb7e1934959c MD5 a4ca7a176fa733f6c4cd6956a6efcb1d vdradmin-am-3.5.2.ebuild 4582 RMD160 f3872096b510e5c8ecc20e98be0e9a6572baf2bf vdradmin-am-3.5.2.ebuild 4582 SHA256 f65f5bb80963132ab0239728eab22dfea0172477e9e8eb7b6cdbeb7e1934959c vdradmin-am-3.5.2.ebuild 4582 -MISC ChangeLog 2259 RMD160 50d4f45cc7997270837a72e59fb1ef1284f579b8 SHA1 4a151803e3dd52cf0b7e5e862e3366374d3e9aff SHA256 a483bef2037b962bbef84844739ac7bb8648f62e4ce1d87420edb0912cf036b1 -MD5 9a9c2fd8db32319fcd62e2c983408def ChangeLog 2259 -RMD160 50d4f45cc7997270837a72e59fb1ef1284f579b8 ChangeLog 2259 -SHA256 a483bef2037b962bbef84844739ac7bb8648f62e4ce1d87420edb0912cf036b1 ChangeLog 2259 +MISC ChangeLog 2589 RMD160 9050006c8d4bc9963ef9276df982b0c7d7c4dc69 SHA1 441a05e9aeca08a4ee21b70582322e5d111ce1b0 SHA256 71285678b1033097ad00d0ece8bd894341c4c9c4d21a2f857b56e93a5a681f8c +MD5 20a33d26c7cafb24dce6f9603e99c618 ChangeLog 2589 +RMD160 9050006c8d4bc9963ef9276df982b0c7d7c4dc69 ChangeLog 2589 +SHA256 71285678b1033097ad00d0ece8bd894341c4c9c4d21a2f857b56e93a5a681f8c ChangeLog 2589 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502 @@ -76,10 +80,13 @@ SHA256 2554f0fecdc5261f0b409e5c7e495769580ea44d5364ca7f53c80228f4232e14 files/di MD5 2dcc653f2dd21d9e521aec3c6c1bd5be files/digest-vdradmin-am-3.5.2 256 RMD160 0405cd3bad1ec700e1f4570a7ac453f51377663e files/digest-vdradmin-am-3.5.2 256 SHA256 04b08f6f57c6fe7c67a646d650043f25f58d3a68e20c30ca3f91235de5e8d22d files/digest-vdradmin-am-3.5.2 256 +MD5 2dcc653f2dd21d9e521aec3c6c1bd5be files/digest-vdradmin-am-3.5.2-r1 256 +RMD160 0405cd3bad1ec700e1f4570a7ac453f51377663e files/digest-vdradmin-am-3.5.2-r1 256 +SHA256 04b08f6f57c6fe7c67a646d650043f25f58d3a68e20c30ca3f91235de5e8d22d files/digest-vdradmin-am-3.5.2-r1 256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFn7f6t2vP6XvVdOcRAifeAKDl69TueGoi97Ve2wCUqORQ2tVaKACfbuih -6H5FwCT8S5rogGblUcK+WHg= -=xPQF +iD8DBQFFsVX1t2vP6XvVdOcRAivxAJ4m1V3sIreD6TAuUAo2OgBaFp6xFgCeIuFV +ReLLQkXyeDOv6L9dR0YmE3w= +=4Ixg -----END PGP SIGNATURE----- diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r1 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r1 new file mode 100644 index 000000000000..06034a01deed --- /dev/null +++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r1 @@ -0,0 +1,3 @@ +MD5 7307c78bf9bf57c9f17311380423e6f4 vdradmin-am-3.5.2.tar.bz2 529968 +RMD160 e1fdbc260f7b44eedda767dd8d383ea645321871 vdradmin-am-3.5.2.tar.bz2 529968 +SHA256 41aa6fcedb40bcc65c71660636871e09e3957892cf6ffd9a583969e680b8ca4e vdradmin-am-3.5.2.tar.bz2 529968 diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.2-r1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.2-r1.ebuild new file mode 100644 index 000000000000..7ac0e1ae7920 --- /dev/null +++ b/net-www/vdradmin-am/vdradmin-am-3.5.2-r1.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.5.2-r1.ebuild,v 1.1 2007/01/19 23:36:11 zzam Exp $ + +inherit eutils + +DESCRIPTION="WWW Admin for the Video Disk Recorder" +HOMEPAGE="http://andreas.vdr-developer.org/" +SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2" + +KEYWORDS="~x86 ~amd64" +SLOT="0" +LICENSE="GPL-2" +IUSE="unicode" + +DEPEND="dev-lang/perl + dev-perl/Template-Toolkit + >=dev-perl/Compress-Zlib-1.2.2 + media-video/vdr + dev-perl/Compress-Zlib + dev-perl/Locale-gettext + dev-perl/Authen-SASL + dev-perl/Digest-HMAC + dev-perl/URI + unicode? ( sys-devel/gettext )" +RDEPEND="${DEPEND}" + + +ETC_DIR="/etc/vdradmin" +LIB_DIR="/usr/share/vdradmin" +VDRADMIN_USER="vdradmin" +VDRADMIN_GROUP="vdradmin" +TMP_DIR=/var/tmp/vdradmin + +pkg_setup() { + enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR} +} + +src_unpack() { + + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-config-autoflush.diff + sed -i vdradmind.pl \ + -e "/COMPILE_DIR/s-/tmp-${TMP_DIR}-" \ + -e "s-/var/run/vdradmind.pid-/var/tmp/vdradmin/vdradmind.pid-" + + # Already on system by dependencies + cd ${S}/lib + rm -r URI MIME File Template.pm +} + + +src_compile() { + + if ! use unicode; then + einfo "no need to compile" + else + einfo "additionally generating utf8 locales" + ${S}/make.sh utf8add || die + ${S}/make.sh po || die + fi +} + +src_install() { + + newinitd ${FILESDIR}/vdradmin-2 vdradmin + newconfd ${FILESDIR}/confd-2 vdradmin + + dobin vdradmind.pl + + insinto ${LIB_DIR}/template + doins -r ${S}/template/* + + insinto ${LIB_DIR}/lib + doins -r ${S}/lib/* + + insinto /usr/share/locale/ + doins -r ${S}/locale/* + + exeinto ${LIB_DIR} + doexe autotimer2searchtimer.pl + + dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ + docinto contrib + dodoc ${S}/contrib/* + + diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}" + keepdir "${ETC_DIR}" + keepdir "${TMP_DIR}" + + dosed "s:FILES_IN_SYSTEM = 0;:FILES_IN_SYSTEM = 1;:g" /usr/bin/vdradmind.pl +} + +pkg_preinst() { + if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then + cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf + else + elog "Creating a new config-file." + echo + + cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf + VDRCONFDIR = /etc/vdr + VIDEODIR = /var/vdr/video + EPG_FILENAME = /var/vdr/video/epg.data + EPGIMAGES = /var/vdr/video/epgimages + PASSWORD = gentoo-vdr + USERNAME = gentoo-vdr + EOF + # feed it with newlines + yes "" \ + | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \ + |sed -e 's/: /: \n/g' + + [[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration." + + elog + elog "Created default user/password: gentoo-vdr/gentoo-vdr" + elog + elog "you can run \"emerge --config vdradmin-am\" if" + elog "the default-values for vdr does not match your" + elog "installation or change it in Setup-Menu of Web-Interface." + elog + fi + chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf +} + +pkg_postinst() { + if [[ -d ${ROOT}${ETC_DIR} ]]; then + local owner=$(stat ${ROOT}${ETC_DIR} -c "%U") + if [[ ${owner} != vdradmin ]]; then + elog "Changing ownership of ${ETC_DIR}." + chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR} + fi + fi + + if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then + ewarn "You have a leftover directory of vdradmin." + ewarn "You can safely remove it with:" + ewarn "# rm -rf /tmp/usr/share/vdradmin/template" + ewarn "# rmdir -p /tmp/usr/share/vdradmin" + fi + + local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf + local SOURCE=${ETC_DIR}/vdradmind.at + if [[ -s ${ROOT}${SOURCE} ]]; then + ewarn "If you used the autotimer of vdradmin," + ewarn "it is a good idea to convert them now" + ewarn "to use with epgsearch." + ewarn + if [[ ! -d ${ROOT}/etc/vdr/plugins/epgsearch ]]; then + ewarn "# install -d -o vdr -g vdr /etc/vdr/plugins/epgsearch" + fi + + local SIZE=0 + + [[ -e ${DEST} ]] && SIZE=$(grep '^[^#]' ${ROOT}${DEST}|wc -l) + + ewarn "If vdr is running with epgsearch-Plugin loaded you can use (recommended):" + local BASE_CMD="${LIB_DIR}/autotimer2searchtimer.pl -i ${SOURCE}" + ewarn "# ${BASE_CMD} -s" + + ewarn + ewarn "Else you can use this:" + if [[ ${SIZE} == 0 ]]; then + ewarn "# ${BASE_CMD} -o ${DEST}" + else + ewarn "You already have some timers defined!." + ewarn "# ${BASE_CMD} -o ${DEST}.new" + ewarn + ewarn "You need to merge epgsearch.conf and epgsearch.conf.new on your own." + ewarn + fi + ewarn "# chown vdr:vdr ${DEST}" + ewarn + ewarn "If you are sure that epgsearch has got all your timer," + ewarn "then you can delete vdradmin-autotimers." + ewarn "# rm ${SOURCE}" + fi +} + +pkg_config() { + /usr/bin/vdradmind.pl -c + chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf +} +