app-antivirus/drweb: merge both ebuilds into one+useflag

svn path=/sunrise/; revision=2315

diff --git a/app-antivirus/drweb/Manifest b/app-antivirus/drweb/Manifest
index ebebbf18015cc468bed025e9e08966e5280c6348..c49caafabd0788edc61b06dbb3547070dc128e8b 100644 (file)
--- a/app-antivirus/drweb/Manifest
+++ b/app-antivirus/drweb/Manifest
@@ -3,17 +3,13 @@ MD5 db9b5a8e2e5e093aaea4f42c86b02f60 files/drweb-4.33-gentoo.patch 2997
 RMD160 e59fa9f1fb5266132c08f4f203520a426460d8e3 files/drweb-4.33-gentoo.patch 2997
 SHA256 fc12c5c641c2779bcc01a408aeaddd8237edc0212192c1188cd21c82e9408102 files/drweb-4.33-gentoo.patch 2997
 DIST drweb-4.33-glibc2.3.tar.gz 5304611 RMD160 a4ec087bb8685a5991d0d8320dcb185990ef5f07 SHA1 0ff2886c8a495739bea09e97694d7ec078786484 SHA256 099f4546bffe31f281cd4107699b1cf2a50311654840c0a671c0fc1ee4f417db
-DIST drweb-4.33-glibc2.4.tar.gz 5356693 RMD160 c00a4b9de9f5399f7362e9d500443873285fff26 SHA1 c60e210900656bc9f19d395e39839adf8e283683 SHA256 3891c670eca03ed14c340010d1519c92a0e50d0dc5b02f523b1259e6219e60c6
+DIST drweb-4.33-glibc2.4.tar.gz 5357706 RMD160 e7fe1ea2dbdb4d135f587ff51bd05d30ae5f6635 SHA1 fa0ac58456b761b301be3ee97285ca6b05a93eb5 SHA256 a237ef5ed048d77e74654deaa793e5c04eae3982480e0770c6d2d42572c72a98
 DIST drweb-433-unix-en-pdf.zip 1084000 RMD160 59aed33c6e3aac81b0e185987d42be2a8deef2ec SHA1 2e35680308a61b6ca48ac1159c5cfcdbdea8cf00 SHA256 df05874b4aae8ef1c3fead244c01742124201934dd4af7bf5398033ac48a130c
 DIST drweb-433-unix-ru-pdf.zip 2493717 RMD160 300a2db8f4a039922dadf50d3554ae3041af8f9c SHA1 a6b49b1d6668076089a71e95c9bea560434c9eb1 SHA256 4ea48900ab7c829daa43119575eb23f92a99ad10adcfe68dc4e45caf4502db17
-EBUILD drweb-4.33-r1.ebuild 3326 RMD160 b653e39bb034262b0d5f2ef5704696ebab576890 SHA1 a45d51410292b60c0cc59073e1caeed1fc96d2d4 SHA256 e094b5fc717f4f1b6802ae1a3eeea5ca7e3b689c43e8d67cb3f4034863cd341e
-MD5 0b55c72e8d4c12d41c20ab01fe527bdf drweb-4.33-r1.ebuild 3326
-RMD160 b653e39bb034262b0d5f2ef5704696ebab576890 drweb-4.33-r1.ebuild 3326
-SHA256 e094b5fc717f4f1b6802ae1a3eeea5ca7e3b689c43e8d67cb3f4034863cd341e drweb-4.33-r1.ebuild 3326
-EBUILD drweb-4.33.ebuild 3326 RMD160 999b096db4857066e22578627aa2e85c930f8efd SHA1 fbf820e0d2166d7b522944fcf9375053ce2a5d2f SHA256 584cce4d10ad2ac2fa60b200820563e9ccad5b310e7c18ecde539c87a09b03c7
-MD5 8d5e27e777c4a2807293dd95e386c273 drweb-4.33.ebuild 3326
-RMD160 999b096db4857066e22578627aa2e85c930f8efd drweb-4.33.ebuild 3326
-SHA256 584cce4d10ad2ac2fa60b200820563e9ccad5b310e7c18ecde539c87a09b03c7 drweb-4.33.ebuild 3326
+EBUILD drweb-4.33-r1.ebuild 3544 RMD160 d8b880f9b00340032f5cff2f3d58dded90f06102 SHA1 992738687b7c8ece59d42a75140dbefb99b13f95 SHA256 65ddb390fd72f0f7535b694608de75a1aef13696dced71a5135235e183db3b4e
+MD5 510d6d1ed4eb4db70645e623131c1aff drweb-4.33-r1.ebuild 3544
+RMD160 d8b880f9b00340032f5cff2f3d58dded90f06102 drweb-4.33-r1.ebuild 3544
+SHA256 65ddb390fd72f0f7535b694608de75a1aef13696dced71a5135235e183db3b4e drweb-4.33-r1.ebuild 3544
 MISC ChangeLog 1040 RMD160 8810b0e9c8e13db58450c14b7e3995a05654e780 SHA1 7659a76852614666371dac3755a6ca74670c1f4b SHA256 f203d658e5bc904b5d7389af9cfeefded9d30939b6402dd00e5f7d17023abcd0
 MD5 ae64e464d3adaff56636ab27b4942393 ChangeLog 1040
 RMD160 8810b0e9c8e13db58450c14b7e3995a05654e780 ChangeLog 1040
@@ -22,9 +18,6 @@ MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f4
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 329f3a12a851ed28a99fab7defb4af98 files/digest-drweb-4.33 780
-RMD160 88da39a42249258f01d79103f4a95636b2b371a7 files/digest-drweb-4.33 780
-SHA256 a78420f6ee368298d21f4d1432496c9524201143cd9cb13292d7fe0d81470527 files/digest-drweb-4.33 780
-MD5 e3b82ae3dea3a02a5f19767b85e28286 files/digest-drweb-4.33-r1 780
-RMD160 e4adb54f6ce122f5f5e8baf07cce160f7802ed7c files/digest-drweb-4.33-r1 780
-SHA256 fbc3985ed5a5fb0d2c2aac3c697904287fbbde393485a7db46dc2a49619a8e97 files/digest-drweb-4.33-r1 780
+MD5 13641ed7b7273f9be6e69652f6aee92a files/digest-drweb-4.33-r1 1042
+RMD160 99ee2a53ec16774c187a1815bd5de9651a80bc60 files/digest-drweb-4.33-r1 1042
+SHA256 7badf65e12466460d8273555c30e064324e224e68f5f54287dcd8904e3c4f28c files/digest-drweb-4.33-r1 1042

diff --git a/app-antivirus/drweb/drweb-4.33-r1.ebuild b/app-antivirus/drweb/drweb-4.33-r1.ebuild
index 7e1bc1e011124a8b8a49b73f42703eea5a86739e..350ba2b96d79e266162aad05e770ab58ab6c3591 100644 (file)
--- a/app-antivirus/drweb/drweb-4.33-r1.ebuild
+++ b/app-antivirus/drweb/drweb-4.33-r1.ebuild
@@ -5,11 +5,11 @@
 inherit eutils
 
 MY_P="drweb-${PV}"
-S="${WORKDIR}/${P}-glibc2.4"
 
 DESCRIPTION="DrWeb virus scaner for Linux"
 HOMEPAGE="http://www.drweb.com/"
-SRC_URI="http://download.drweb.com/files/unix/Linux/Generic/${MY_P}-glibc2.4.tar.gz
+SRC_URI="glibc23? ( http://download.drweb.com/files/unix/Linux/Generic/${MY_P}-glibc2.3.tar.gz )
+       !glibc23? ( http://download.drweb.com/files/unix/Linux/Generic/${MY_P}-glibc2.4.tar.gz )
        doc? ( linguas_ru? ( ftp://ftp.drweb.com/pub/drweb/unix/doc/${PN}-${PV/./}-unix-ru-pdf.zip ) )
        doc? ( ftp://ftp.drweb.com/pub/drweb/unix/doc/${PN}-${PV/./}-unix-en-pdf.zip )"
 RESTRICT="mirror strip"
@@ -17,22 +17,25 @@ RESTRICT="mirror strip"
 SLOT="0"
 LICENSE="DRWEB"
 KEYWORDS="~x86"
-IUSE="doc linguas_ru logrotate"
+IUSE="doc glibc23 linguas_ru logrotate"
 
 DEPEND="app-arch/unzip"
 RDEPEND="${DEPEND}
        dev-perl/libwww-perl
        virtual/cron
        logrotate? ( app-admin/logrotate )
-       =sys-libs/glibc-2.4*
+       glibc23? ( =sys-libs/glibc-2.3* )
+       !glibc23? ( =sys-libs/glibc-2.4* )
        !=sys-libs/glibc-2.5*"
 
 PROVIDE="virtual/antivirus"
+use glibc23 && S="${WORKDIR}/${P}-glibc2.3"
+use glibc23 || S="${WORKDIR}/${P}-glibc2.4"
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}/${PF}-gentoo.patch"
+       epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 pkg_setup() {

diff --git a/app-antivirus/drweb/drweb-4.33.ebuild b/app-antivirus/drweb/drweb-4.33.ebuild
deleted file mode 100644 (file)
index 8323f6f..0000000
--- a/app-antivirus/drweb/drweb-4.33.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-MY_P="drweb-${PV}"
-S="${WORKDIR}/${P}-glibc2.3"
-
-DESCRIPTION="DrWeb virus scaner for Linux"
-HOMEPAGE="http://www.drweb.com/"
-SRC_URI="http://download.drweb.com/files/unix/Linux/Generic/${MY_P}-glibc2.3.tar.gz
-       doc? ( linguas_ru? ( ftp://ftp.drweb.com/pub/drweb/unix/doc/${PN}-${PV/./}-unix-ru-pdf.zip ) )
-       doc? ( ftp://ftp.drweb.com/pub/drweb/unix/doc/${PN}-${PV/./}-unix-en-pdf.zip )"
-RESTRICT="mirror strip"
-
-SLOT="0"
-LICENSE="DRWEB"
-KEYWORDS="~x86"
-IUSE="doc linguas_ru logrotate"
-
-DEPEND="app-arch/unzip"
-RDEPEND="${DEPEND}
-       dev-perl/libwww-perl
-       virtual/cron
-       logrotate? ( app-admin/logrotate )
-       =sys-libs/glibc-2.3*
-       !>=sys-libc/glibc-2.4"
-
-PROVIDE="virtual/antivirus"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${PF}-gentoo.patch"
-}
-
-pkg_setup() {
-       enewgroup drweb
-       enewuser drweb -1 -1 /var/drweb drweb
-}
-
-src_compile() {
-       einfo "Nothing to compile, installing DrWeb..."
-}
-
-src_install() {
-       cp -pPR "${S}"/opt/ "${D}"/opt
-       cp -pPR "${S}"/var/ "${D}"/var
-       cp -pPR "${S}"/etc/ "${D}"/etc
-
-       # Create log dir in proper location
-       rm -rf "${D}"/var/drweb/log/
-       rm -rf "${D}"/var/drweb/spool/
-       dodir /var/log/drweb
-       dodir /var/spool/drweb
-
-       # Set up permissions
-       fowners drweb:drweb /opt/drweb/lib
-       fowners drweb:drweb /var/drweb/{bases,infected,run,updates}
-       fowners drweb:drweb /etc/drweb/email.ini
-       fowners drweb:drweb /var/log/drweb
-       fowners drweb:drweb /var/spool/drweb
-       fperms 0640 /etc/drweb/email.ini
-       fperms 0750 /var/drweb/infected
-       fperms 0700 /var/drweb/run
-       fperms 0700 /var/drweb/updates
-       fperms 0770 /var/spool/drweb
-       chown -R drweb:drweb "${D}"/var/drweb/bases
-       chown -R drweb:drweb "${D}"/opt/drweb/lib
-
-       if use logrotate ; then
-               insinto /etc/logrotate.d
-               newins "${D}"/etc/drweb/drweb-log drweb
-       fi
-       rm -f "${D}"/etc/drweb/drweb-log
-
-       newinitd "${D}"/etc/init.d/drwebd drweb
-       rm -f "${D}"/etc/init.d/drwebd
-
-       local docdir="${D}/opt/drweb/doc"
-       for doc in ${docdir}/{ChangeLog,FAQ,readme.{eicar,license}} \
-       ${docdir}/{daemon/readme.daemon,scanner/readme.scanner,update/readme.update}
-       do
-               dodoc ${doc} && rm -f ${doc}
-               if use linguas_ru; then
-                       dodoc ${doc}.rus && rm -f ${doc}.rus
-               fi
-       done
-       dodoc "${D}"/opt/drweb/getkey.HOWTO
-       use linguas_ru && dodoc "${D}"/opt/drweb/getkey.rus.HOWTO
-
-       rm -rf ${docdir} && rm -f "${D}"/opt/drweb/getkey.*
-
-       use doc && dodoc ${WORKDIR}/drwunxen.pdf
-       use doc && use linguas_ru && dodoc ${WORKDIR}/drwunxru.pdf
-}
-
-pkg_postinst() {
-       elog
-       elog " Create a cron entry for DrWeb auto updates in a similar manner:"
-       elog
-       elog " crontab -u drweb -e"
-       elog
-       elog " and add the following line (change the frequency of update if required):"
-       elog
-       elog " * */4 * * *     if [ -x /opt/drweb/update/update.pl ]; then /opt/drweb/update/update.pl; fi"
-       elog
-
-       elog
-       elog "To configure DrWeb, edit /etc/drweb/drweb32.ini as needed."
-       elog
-
-       if use logrotate ; then
-               elog "DrWeb logrotate script has been provided."
-               elog "Edit /etc/logrotate.d/drweb as needed."
-       fi
-
-       ewarn
-       ewarn "IMPORTANT!!!"
-       ewarn
-       ewarn "If you don't have a license for DrWeb, go to http://download.drweb.com/demo/ "
-       ewarn "to obtain a demo licence."
-       ewarn
-       ewarn "Additional information can be obtained from /usr/share/doc/${PF}/readme.license"
-}

diff --git a/app-antivirus/drweb/files/digest-drweb-4.33 b/app-antivirus/drweb/files/digest-drweb-4.33
deleted file mode 100644 (file)
index 1d0747d..0000000
--- a/app-antivirus/drweb/files/digest-drweb-4.33
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 fe4abfdd5c60d9e2c74f60584712ea1f drweb-4.33-glibc2.3.tar.gz 5304611
-RMD160 a4ec087bb8685a5991d0d8320dcb185990ef5f07 drweb-4.33-glibc2.3.tar.gz 5304611
-SHA256 099f4546bffe31f281cd4107699b1cf2a50311654840c0a671c0fc1ee4f417db drweb-4.33-glibc2.3.tar.gz 5304611
-MD5 7e2efdf9c411588ded7d4cb2ead65481 drweb-433-unix-en-pdf.zip 1084000
-RMD160 59aed33c6e3aac81b0e185987d42be2a8deef2ec drweb-433-unix-en-pdf.zip 1084000
-SHA256 df05874b4aae8ef1c3fead244c01742124201934dd4af7bf5398033ac48a130c drweb-433-unix-en-pdf.zip 1084000
-MD5 bb1827ab6d8dbd3b5db25207989e50c5 drweb-433-unix-ru-pdf.zip 2493717
-RMD160 300a2db8f4a039922dadf50d3554ae3041af8f9c drweb-433-unix-ru-pdf.zip 2493717
-SHA256 4ea48900ab7c829daa43119575eb23f92a99ad10adcfe68dc4e45caf4502db17 drweb-433-unix-ru-pdf.zip 2493717

diff --git a/app-antivirus/drweb/files/digest-drweb-4.33-r1 b/app-antivirus/drweb/files/digest-drweb-4.33-r1
index 27f4e3cd596b8651c0677d1835b22dd92d4b4531..62d28d74acd4e189eaf52a8eddd3e43055974833 100644 (file)
--- a/app-antivirus/drweb/files/digest-drweb-4.33-r1
+++ b/app-antivirus/drweb/files/digest-drweb-4.33-r1
@@ -1,6 +1,9 @@
-MD5 613da69e2d5924b6a2e03f2af0d21660 drweb-4.33-glibc2.4.tar.gz 5356693
-RMD160 c00a4b9de9f5399f7362e9d500443873285fff26 drweb-4.33-glibc2.4.tar.gz 5356693
-SHA256 3891c670eca03ed14c340010d1519c92a0e50d0dc5b02f523b1259e6219e60c6 drweb-4.33-glibc2.4.tar.gz 5356693
+MD5 fe4abfdd5c60d9e2c74f60584712ea1f drweb-4.33-glibc2.3.tar.gz 5304611
+RMD160 a4ec087bb8685a5991d0d8320dcb185990ef5f07 drweb-4.33-glibc2.3.tar.gz 5304611
+SHA256 099f4546bffe31f281cd4107699b1cf2a50311654840c0a671c0fc1ee4f417db drweb-4.33-glibc2.3.tar.gz 5304611
+MD5 bc046cc0e7fe4981d8739d8d4d8b0e2d drweb-4.33-glibc2.4.tar.gz 5357706
+RMD160 e7fe1ea2dbdb4d135f587ff51bd05d30ae5f6635 drweb-4.33-glibc2.4.tar.gz 5357706
+SHA256 a237ef5ed048d77e74654deaa793e5c04eae3982480e0770c6d2d42572c72a98 drweb-4.33-glibc2.4.tar.gz 5357706
 MD5 7e2efdf9c411588ded7d4cb2ead65481 drweb-433-unix-en-pdf.zip 1084000
 RMD160 59aed33c6e3aac81b0e185987d42be2a8deef2ec drweb-433-unix-en-pdf.zip 1084000
 SHA256 df05874b4aae8ef1c3fead244c01742124201934dd4af7bf5398033ac48a130c drweb-433-unix-en-pdf.zip 1084000