From 469294db3a8265cd12e8240180d83a6dadeb1a03 Mon Sep 17 00:00:00 2001 From: Joerg Bornkessel Date: Sat, 1 Mar 2008 22:57:35 +0000 Subject: [PATCH] clean up; moved perl-core to virtual stuff, bug 211623 Package-Manager: portage-2.1.3.19 --- net-www/xxv/ChangeLog | 9 +- net-www/xxv/Manifest | 15 +- net-www/xxv/xxv-1.0.1-r1.ebuild | 18 +- net-www/xxv/xxv-1.0.1.ebuild | 187 ----------------- net-www/xxv/xxv-1.0.ebuild | 191 ------------------ .../xxv/{xxv-1.2.ebuild => xxv-1.2-r1.ebuild} | 14 +- 6 files changed, 32 insertions(+), 402 deletions(-) delete mode 100644 net-www/xxv/xxv-1.0.1.ebuild delete mode 100644 net-www/xxv/xxv-1.0.ebuild rename net-www/xxv/{xxv-1.2.ebuild => xxv-1.2-r1.ebuild} (93%) diff --git a/net-www/xxv/ChangeLog b/net-www/xxv/ChangeLog index 9fa8f7eaff36..30df389e2ff5 100644 --- a/net-www/xxv/ChangeLog +++ b/net-www/xxv/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-www/xxv # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/ChangeLog,v 1.6 2008/02/24 18:57:53 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/ChangeLog,v 1.7 2008/03/01 22:57:35 hd_brummy Exp $ + +*xxv-1.2-r1 (01 Mar 2008) + + 01 Mar 2008; Joerg Bornkessel -xxv-1.0.ebuild, + -xxv-1.0.1.ebuild, xxv-1.0.1-r1.ebuild, -xxv-1.2.ebuild, + +xxv-1.2-r1.ebuild: + clean up; moved perl-core to virtual stuff, bug 211623 *xxv-1.2 (24 Feb 2008) diff --git a/net-www/xxv/Manifest b/net-www/xxv/Manifest index 82c8bcd939a6..1ce24e436c38 100644 --- a/net-www/xxv/Manifest +++ b/net-www/xxv/Manifest @@ -6,19 +6,16 @@ AUX xxv-1.0-logerror.patch 1477 RMD160 3795497ed97d16af9f7b10874619f567e723cc86 AUX xxvd-1.0.cfg 2257 RMD160 2f0ed9987f6a85fa4bc1a7ae68b31251f4e72b00 SHA1 f82efba3aefb1216067767e52236e119da6d65dc SHA256 a49c7c402e8c9990f84e8b3ae5207559f9dd9262075b5ab0606058ff08061016 AUX xxvd-logrotate 477 RMD160 cf179b200bca2ba165550530c5a4dc6e3e01838f SHA1 c761c5f9a6702c674e24410660f285d7a5854aec SHA256 3f4aa0de2dd635532df74ad60074724f2dce62a7a716824dac0cdb228d868d95 DIST xxv-1.0.1.tgz 920320 RMD160 fa71db154cb9d185e6175f21d4e2ad3fa1747cd6 SHA1 b58e81e218e47e99e9fddbdeab776201c266a044 SHA256 94a13c087e7a6d180b3e23815bd8d36b1ee5ac81fd31faa0f825d0395d8d6f78 -DIST xxv-1.0.tgz 1740659 RMD160 94df23da24d2dc228de542882ad84b4d69a81882 SHA1 4858a32f2b23f760a3cb902dc27d1db8f2a43f2c SHA256 8d9d2146141589da450178604121fc050e3c186dddf902d1224d013a3bd0d2cf DIST xxv-1.2.tgz 921715 RMD160 9b621719b78fc64616fcd75a753e32a8c18ab9db SHA1 cf6d6fd25481f004ad4fab333790f9d5d8024c83 SHA256 699f2ad9ec8b608758290fcf52bdab26a972f89dd2c0e5b22edc8dc647930b32 -EBUILD xxv-1.0.1-r1.ebuild 4397 RMD160 6751d08a2bad8753c7f98f914b4780d18278c3cf SHA1 2897cc08b48953f8ac7753d63d35602206d0fcb4 SHA256 954d8f86f368c104532d68b6b9a268750da0603478dc4c9bb465762679cca1bd -EBUILD xxv-1.0.1.ebuild 4390 RMD160 eba6514436eece53b21ddbe5ae43b698af1bd65b SHA1 19e4203f9fe434f30c4b325aaa4c51f50b519436 SHA256 8374c9e8efc9a2d3336c24a9408ea38f8e0d3038eed90bad885588c96f4a904f -EBUILD xxv-1.0.ebuild 4512 RMD160 b089cb6f3a38d0f89df86fe4c3023dd68b08c3bd SHA1 6740a4ffd802963f9f1a9806494ae4ad6506bf14 SHA256 48be865a4041666f03056772cc57b2de01ec2348421cf03bc6bff47f431ff9ab -EBUILD xxv-1.2.ebuild 4336 RMD160 c4b102d12cb5b3d9fcb0a6350ea194b9b8ba94a9 SHA1 e85b5231d638c71d006e9011c8f8614af6407da7 SHA256 1416ffad25c368b11d06aa7d16fa089377fd5a1aa66cf4944cf8fb7640fd269c -MISC ChangeLog 1101 RMD160 7ee7160181e7a86103aed892e8beb31346c887b1 SHA1 02a3733b0114e4f06c19998c5c2956ce13ddf7fb SHA256 714b06f1707d74c2b893d4e2b2c09dceec8ad785f33a9c8f09eb5d85876355b2 +EBUILD xxv-1.0.1-r1.ebuild 4454 RMD160 87af1addd02695d7ae6f44d8433e876455f55c6a SHA1 99e206ad49a5b2cc3ee00f882079e09305b36666 SHA256 4338983b841937ecfde1f68c7540a5fae553070f4dba4d0308ea53b56034a121 +EBUILD xxv-1.2-r1.ebuild 4395 RMD160 f3cdb85fdde693fb4d4cccd56eaab273be45f9aa SHA1 4e6d47013ab4cdfea08f0a9cd633447370e86780 SHA256 6d877071a96f9e17f1c5e7f660977626626769873dd4b4ec5651bdc11cd457eb +MISC ChangeLog 1339 RMD160 e1180df6d1388b11e51e0f720c9bdc16a187f52c SHA1 dbe33af9b931f6f23f8aa36ce5f2278879dc1812 SHA256 013ea3b3123163819f2e123fabc3e980aa5a41e842a2902c805c1d371bcf9f84 MISC metadata.xml 505 RMD160 d9f9f87054d19eb338514ec2a2420e0326cdd820 SHA1 c06a6dd13457eba71d2f85bc0a89ea7660f21a8e SHA256 48e92504e7bab6cb0434cbe74e562ec43a6250f1d530c7533a311b516179890c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFHwb49dn07HTTCgIoRAkL8AJ0UirA37z5alRnn3w+0SOVDHy0GrQCgjndz -8BdTMIBxC6W4YdyKsouPwaQ= -=9L/j +iD8DBQFHyd/5dn07HTTCgIoRAl8YAKCaOGxNvCjT8hXx6h1DbVYXLCrpsQCffw5E +sF3hozbQnH49ih+uS4IIDqU= +=UJ9T -----END PGP SIGNATURE----- diff --git a/net-www/xxv/xxv-1.0.1-r1.ebuild b/net-www/xxv/xxv-1.0.1-r1.ebuild index 1b0f30e45fb2..801decda58b1 100644 --- a/net-www/xxv/xxv-1.0.1-r1.ebuild +++ b/net-www/xxv/xxv-1.0.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.0.1-r1.ebuild,v 1.1 2007/12/05 20:44:05 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/xxv/xxv-1.0.1-r1.ebuild,v 1.2 2008/03/01 22:57:35 hd_brummy Exp $ inherit eutils @@ -17,11 +17,11 @@ RDEPEND=">=media-video/vdr-1.2.6 media-video/vdr2jpeg media-fonts/ttf-bitstream-vera dev-db/mysql - perl-core/CGI - perl-core/Digest-MD5 - perl-core/Getopt-Long - perl-core/MIME-Base64 - perl-core/Time-HiRes + virtual/perl-CGI + virtual/perl-Digest-MD5 + virtual/perl-Getopt-Long + virtual/perl-MIME-Base64 + virtual/perl-Time-HiRes dev-perl/Compress-Zlib dev-perl/Config-Tiny dev-perl/Digest-HMAC @@ -151,7 +151,9 @@ pkg_postinst() { einfo "will update your XXV Database" fi else - einfo "You have to create a empty DB for XXV" + einfo "If this is a new install" + einfo "you have to create a empty DB for XXV" + echo einfo "do this by:" einfo "cd ${SHAREDIR}/contrib" eerror "read the README" diff --git a/net-www/xxv/xxv-1.0.1.ebuild b/net-www/xxv/xxv-1.0.1.ebuild deleted file mode 100644 index 071a6ee2e882..000000000000 --- a/net-www/xxv/xxv-1.0.1.ebuild +++ /dev/null @@ -1,187 +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/xxv/xxv-1.0.1.ebuild,v 1.3 2007/12/03 22:58:56 hd_brummy Exp $ - -inherit eutils - -DESCRIPTION="WWW Admin for the VDR (Video Disk Recorder)" -HOMEPAGE="http://xxv.berlios.de/content/view/37/1/" -SRC_URI="http://download.berlios.de/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="mplayer" - -RDEPEND=">=media-video/vdr-1.2.6 - media-video/vdr2jpeg - media-fonts/ttf-bitstream-vera - dev-db/mysql - perl-core/CGI - perl-core/Digest-MD5 - perl-core/Getopt-Long - perl-core/MIME-Base64 - perl-core/Time-HiRes - dev-perl/Compress-Zlib - dev-perl/Config-Tiny - dev-perl/Digest-HMAC - dev-perl/Encode-Detect - dev-perl/GD - dev-perl/DateManip - dev-perl/DBD-mysql - dev-perl/DBI - dev-perl/Event - dev-perl/IO-Socket-INET6 - dev-perl/JSON - dev-perl/Locale-gettext - dev-perl/MP3-Info - dev-perl/Net-Amazon - dev-perl/Net-Telnet - dev-perl/Net-XMPP - dev-perl/Proc-ProcessTable - dev-perl/TextToHTML - dev-perl/Template-Toolkit - dev-perl/SOAP-Lite - dev-perl/XML-RSS" - -PDEPEND="mplayer? ( media-video/mplayer )" - -SHAREDIR="/usr/share/${PN}" -LIBDIR="/usr/lib/${PN}" - -DB_VERS="25" - -pkg_setup() { - - if ! built_with_use dev-perl/GD png gif ; then - echo - eerror "Please recompile dev-perl/GD with" - eerror "USE=\"png gif\"" - die "dev-perl/GD need png and gif support" - fi - - if ! has_version "net-www/${PN}"; then - echo - einfo "Before you install xxv at first time you should read" - einfo "http://www.vdr-wiki.de/wiki/index.php/Xxv German only available" - echo - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i "${S}"/bin/xxvd \ - -e "s:debian:Gentoo:" \ - -e "s:/var/log/xxvd.log:/var/log/xxv/xxvd.log:" \ - -e "s:/var/run/xxvd.pid:/var/run/xxv/xxvd.pid:" \ - -e "s:\$RealBin/../lib:${LIBDIR}:" \ - -e "s:\$RealBin/../locale:${SHAREDIR}/locale:" \ - -e "s:\$RealBin/../lib/XXV/MODULES:${LIBDIR}/XXV/MODULES:" \ - -e "s:\$RealBin/../etc/xxvd.cfg:/etc/xxv/xxvd.cfg:" \ - -e "s:\$RealBin/../doc:/usr/share/doc/${P}:" \ - -e "s:HTMLDIR => \"\$RealBin/../:HTMLDIR => \"${SHAREDIR}/skins:" \ - -e "s:\$RealBin/../share/vtx:${SHAREDIR}/vtx:" \ - -e "s:\$RealBin/../lib/XXV/OUTPUT:${LIBDIR}/XXV/OUTPUT:" \ - -e "s:\$RealBin/../share/news:${SHAREDIR}/news:" \ - -e "s:\$RealBin/../contrib:${SHAREDIR}/contrib:" \ - -e "s:\$RealBin/../share/fonts/:/usr/share/fonts/:" - - sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl - -# epatch "${FILESDIR}"/"${P}"-logerror.patch -} - -src_compile() { -: -} - -src_install() { - - doinitd "${FILESDIR}"/xxv - - dobin bin/xxvd - - insinto /etc/"${PN}" - newins "${FILESDIR}"/xxvd-1.0.cfg xxvd.cfg - - insinto /etc/logrotate.d - newins "${FILESDIR}"/xxvd-logrotate xxvd - - diropts -m755 -ovdr -gvdr - keepdir /var/cache/xxv - keepdir /var/run/xxv - keepdir /var/log/xxv - - insinto "${LIBDIR}" - doins -r "${S}"/lib/* - - insinto "${SHAREDIR}" - doins -r "${S}"/share/{news,vtx} - - insinto "${SHAREDIR}"/locale - doins -r "${S}"/locale/* - fperms 0755 "${SHAREDIR}"/locale/xgettext.pl - - insinto "${SHAREDIR}"/contrib - doins -r "${S}"/contrib/* - fperms 0755 "${SHAREDIR}"/contrib/update-xxv - - insinto "${SHAREDIR}"/skins - doins -r "${S}"/{html,wml} - doins "${S}"/doc/docu.tmpl - - cd "${S}"/doc - insinto /usr/share/doc/"${P}" - doins docu.tmpl CHANGELOG COPYING LIESMICH NEWS README TODO TUTORIAL.txt.gz - fowners vdr:vdr /usr/share/doc/"${P}" - - doman xxvd.1 -} - -pkg_postinst() { - - if has_version "net-www/${PN}"; then - if has_version "= \"\$RealBin/../:HTMLDIR => \"${SHAREDIR}/skins:" \ - -e "s:\$RealBin/../share/vtx:${SHAREDIR}/vtx:" \ - -e "s:\$RealBin/../lib/XXV/OUTPUT:${LIBDIR}/XXV/OUTPUT:" \ - -e "s:\$RealBin/../share/news:${SHAREDIR}/news:" \ - -e "s:\$RealBin/../contrib:${SHAREDIR}/contrib:" \ - -e "s:\$RealBin/../share/fonts/:/usr/share/fonts/:" - - sed -i "s:\$RealBin/../lib:${LIBDIR}:" ./locale/xgettext.pl - - epatch "${FILESDIR}"/"${P}"-logerror.patch -} - -src_compile() { -: -} - -src_install() { - - doinitd "${FILESDIR}"/xxv - - dobin bin/xxvd - - insinto /etc/"${PN}" - newins "${FILESDIR}"/xxvd-"${PV}".cfg xxvd.cfg - - insinto /etc/logrotate.d - newins "${FILESDIR}"/xxvd-logrotate xxvd - - diropts -m755 -ovdr -gvdr - keepdir /var/cache/xxv - keepdir /var/run/xxv - keepdir /var/log/xxv - - insinto "${LIBDIR}" - doins -r "${S}"/lib/* - - insinto "${SHAREDIR}" - doins -r "${S}"/share/{news,vtx} - - insinto "${SHAREDIR}"/locale - doins -r "${S}"/locale/* - fperms 0755 "${SHAREDIR}"/locale/xgettext.pl - - insinto "${SHAREDIR}"/contrib - doins -r "${S}"/contrib/* - fperms 0755 "${SHAREDIR}"/contrib/update-xxv - - insinto "${SHAREDIR}"/skins - doins -r "${S}"/{html,wml} - doins "${S}"/doc/docu.tmpl - - cd "${S}"/doc - insinto /usr/share/doc/"${P}" - doins docu.tmpl CHANGELOG.txt COPYING.txt LIESMICH.txt NEWS.txt README.txt TODO.txt TUTORIAL.txt.gz - fowners vdr:vdr /usr/share/doc/"${P}" - - doman xxvd.1 -} - -pkg_postinst() { - - if has_version "net-www/${PN}"; then - if has_version "=