From cc48124ea3d464cde266bb3a75d4d24670b9c55a Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Sun, 21 Jan 2007 13:22:18 +0000 Subject: [PATCH] Now remove all additional packages, keep only one that is new. Package-Manager: portage-2.1.2-r1 --- net-www/vdradmin-am/ChangeLog | 9 +- net-www/vdradmin-am/Manifest | 35 ++-- .../files/digest-vdradmin-am-3.5.2-r1 | 3 - ...n-am-3.5.2 => digest-vdradmin-am-3.5.2-r2} | 0 ...-r1.ebuild => vdradmin-am-3.5.2-r2.ebuild} | 12 +- net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild | 177 ------------------ 6 files changed, 26 insertions(+), 210 deletions(-) delete mode 100644 net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r1 rename net-www/vdradmin-am/files/{digest-vdradmin-am-3.5.2 => digest-vdradmin-am-3.5.2-r2} (100%) rename net-www/vdradmin-am/{vdradmin-am-3.5.2-r1.ebuild => vdradmin-am-3.5.2-r2.ebuild} (95%) delete mode 100644 net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog index 02404eda2ff4..3c3aacdd44b5 100644 --- a/net-www/vdradmin-am/ChangeLog +++ b/net-www/vdradmin-am/ChangeLog @@ -1,6 +1,13 @@ # 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.11 2007/01/19 23:36:11 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.12 2007/01/21 13:22:17 zzam Exp $ + +*vdradmin-am-3.5.2-r2 (21 Jan 2007) + + 21 Jan 2007; Matthias Schwarzott + -vdradmin-am-3.5.2.ebuild, -vdradmin-am-3.5.2-r1.ebuild, + +vdradmin-am-3.5.2-r2.ebuild: + Now remove all additional packages, keep only one that is new. *vdradmin-am-3.5.2-r1 (19 Jan 2007) diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest index 2bf1f2ae39f6..610284aa4836 100644 --- a/net-www/vdradmin-am/Manifest +++ b/net-www/vdradmin-am/Manifest @@ -46,18 +46,14 @@ 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 2589 RMD160 9050006c8d4bc9963ef9276df982b0c7d7c4dc69 SHA1 441a05e9aeca08a4ee21b70582322e5d111ce1b0 SHA256 71285678b1033097ad00d0ece8bd894341c4c9c4d21a2f857b56e93a5a681f8c -MD5 20a33d26c7cafb24dce6f9603e99c618 ChangeLog 2589 -RMD160 9050006c8d4bc9963ef9276df982b0c7d7c4dc69 ChangeLog 2589 -SHA256 71285678b1033097ad00d0ece8bd894341c4c9c4d21a2f857b56e93a5a681f8c ChangeLog 2589 +EBUILD vdradmin-am-3.5.2-r2.ebuild 4745 RMD160 fb600751fc461c7ed9d4418d0b6dd2e98c5a6bbf SHA1 c2140153addab06fd928c890ea167cb6416c92ce SHA256 41324c04363554530d6be89ff050e5c9f2783d4eb59623c3a78cb9b796d0ae22 +MD5 0af6ae675f85109d5c0644a3f013b318 vdradmin-am-3.5.2-r2.ebuild 4745 +RMD160 fb600751fc461c7ed9d4418d0b6dd2e98c5a6bbf vdradmin-am-3.5.2-r2.ebuild 4745 +SHA256 41324c04363554530d6be89ff050e5c9f2783d4eb59623c3a78cb9b796d0ae22 vdradmin-am-3.5.2-r2.ebuild 4745 +MISC ChangeLog 2836 RMD160 212de1a9a3b459d506a7e5b5cbebef6584588ad9 SHA1 132147b2e165888a12433c1c4b3eebfc2094bc64 SHA256 026a15ae5c7b4b5535aaff7749001cda1e29a3e39e5f846873281c6c73665d34 +MD5 34bb770b3e55152691f3deedac75fb74 ChangeLog 2836 +RMD160 212de1a9a3b459d506a7e5b5cbebef6584588ad9 ChangeLog 2836 +SHA256 026a15ae5c7b4b5535aaff7749001cda1e29a3e39e5f846873281c6c73665d34 ChangeLog 2836 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502 @@ -77,16 +73,13 @@ SHA256 1fc2d6ab356d90f5cfddc7dc9b6831cf1960b2b29c8011c85293cf9f2b5ee2a3 files/di MD5 46bbca1ada218400524c7dab0913060e files/digest-vdradmin-am-3.5.1 256 RMD160 bea77b6c860a693678e789fcc68f891a34a54ae9 files/digest-vdradmin-am-3.5.1 256 SHA256 2554f0fecdc5261f0b409e5c7e495769580ea44d5364ca7f53c80228f4232e14 files/digest-vdradmin-am-3.5.1 256 -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 +MD5 2dcc653f2dd21d9e521aec3c6c1bd5be files/digest-vdradmin-am-3.5.2-r2 256 +RMD160 0405cd3bad1ec700e1f4570a7ac453f51377663e files/digest-vdradmin-am-3.5.2-r2 256 +SHA256 04b08f6f57c6fe7c67a646d650043f25f58d3a68e20c30ca3f91235de5e8d22d files/digest-vdradmin-am-3.5.2-r2 256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFsVX1t2vP6XvVdOcRAivxAJ4m1V3sIreD6TAuUAo2OgBaFp6xFgCeIuFV -ReLLQkXyeDOv6L9dR0YmE3w= -=4Ixg +iD8DBQFFs2kVt2vP6XvVdOcRAlHTAKCZXStUXQ3oKab0FIuMUptl71T2PgCcC1oU +HICJ9y3LyiirE22KDJN1f/4= +=fG74 -----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 deleted file mode 100644 index 06034a01deed..000000000000 --- a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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/files/digest-vdradmin-am-3.5.2 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r2 similarity index 100% rename from net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2 rename to net-www/vdradmin-am/files/digest-vdradmin-am-3.5.2-r2 diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.2-r1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild similarity index 95% rename from net-www/vdradmin-am/vdradmin-am-3.5.2-r1.ebuild rename to net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild index 7ac0e1ae7920..496203feba28 100644 --- a/net-www/vdradmin-am/vdradmin-am-3.5.2-r1.ebuild +++ b/net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.5.2-r2.ebuild,v 1.1 2007/01/21 13:22:17 zzam Exp $ inherit eutils @@ -8,7 +8,7 @@ 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" +KEYWORDS="~amd64 ~x86" SLOT="0" LICENSE="GPL-2" IUSE="unicode" @@ -44,10 +44,6 @@ src_unpack() { 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 } @@ -72,8 +68,8 @@ src_install() { insinto ${LIB_DIR}/template doins -r ${S}/template/* - insinto ${LIB_DIR}/lib - doins -r ${S}/lib/* + insinto ${LIB_DIR}/lib/Template/Plugin + doins -r ${S}/lib/Template/Plugin/JavaScript.pm insinto /usr/share/locale/ doins -r ${S}/locale/* diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild deleted file mode 100644 index 8cbb0dbdb403..000000000000 --- a/net-www/vdradmin-am/vdradmin-am-3.5.2.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# 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.ebuild,v 1.3 2007/01/06 14:53:38 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" - -RDEPEND="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 - unicode? ( sys-devel/gettext )" - -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-" -} - - -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' - - 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 -} - -- 2.26.2