From 40b265089c983d3f373d40fec2ea87893e3828ee Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 21 Mar 2015 16:38:36 +0000 Subject: [PATCH] use dobin instead of exeinto /usr/bin/ && doexe Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- mail-filter/dspam/ChangeLog | 7 ++- mail-filter/dspam/Manifest | 26 ++++++++--- mail-filter/dspam/dspam-3.10.2-r1.ebuild | 55 ++++++++++++------------ 3 files changed, 51 insertions(+), 37 deletions(-) diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog index 9dd7e883b393..ec138a16bd36 100644 --- a/mail-filter/dspam/ChangeLog +++ b/mail-filter/dspam/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-filter/dspam -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.159 2014/12/28 15:53:32 titanofold Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.160 2015/03/21 16:38:35 jlec Exp $ + + 21 Mar 2015; Justin Lecher dspam-3.10.2-r1.ebuild: + use dobin instead of exeinto /usr/bin/ && doexe 28 Dec 2014; Aaron W. Swenson dspam-3.10.2-r1.ebuild: Rename virtual/postgresql to dev-db/postgresql diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest index 7878b4291e16..a866e261fb58 100644 --- a/mail-filter/dspam/Manifest +++ b/mail-filter/dspam/Manifest @@ -1,18 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX dspam.confd 299 SHA256 fdc691c71a2518c13f61aa44159f1318b03ba4f9ca004a3f38c3c95ba6f02e63 SHA512 fed17bf8b053924b42d7eaf11508ce3a75ca065c495c68a41016d82456cc8055bbd19c67135ab3d0d8cffe9717487c7000c8600a8dc1e077d18052919d98b433 WHIRLPOOL 1e4bb58293b4be546c9d88d385fb16d43f2edb8c237acd51a9ac98a1ec2f61717fe5822e7baf15ac0b92c2597d3d7c4954653d627275196944b77233a92680ce AUX dspam.cron-r4 160 SHA256 ef59ea37a272b3d044a59fc1f30d1c60087e15d5735ba961cc57458cc5026aca SHA512 b00260fb3017c34d6c37ac97139dda82a609740ee751f8e97487e9bbdb27582715adab418fcf4650c34a0b0d04ebad9c2aac14580e29a5cfca78b783b3e8c14c WHIRLPOOL 02745878d432907510f0363f31f17d6d9a10643ae2f6b5fe5cdaa83b5fa6fda98cb39e74b3b257af3faefa1be62a97ea2c24f8a1764103d4b141a8a4adb3213a AUX dspam.initd 979 SHA256 4eaf5da3420a6196ce987429bedf3ba25d21616ea1eb2ebc35c58778c0105d7c SHA512 5b16302e841e8144086333817b19fac7b34ac2151b4345e3d55263c7155617ec0ecb8a9ce6ae72d042197d323902a7f6206738c9a4df617d4deba986ee1c1397 WHIRLPOOL ecf7487b804ecd5543ac45e34d3472435224b5e236c5c8e74527338b08a5d7b08215074b2112957509251e4abf4a01a089f2a9e36e63468aa2e3944f81a967ee AUX dspam.logrotate 180 SHA256 17285ab0e624ec52124e8f661649ac9549c00e91a2f8d0d6d9de4eabf273d582 SHA512 8178e7ce02ca11171bc5650b70583fa02d2a84a25d184bbee1760618355578826c34a423d76310135f773e37d5ecab565a707ed1d33190005daf1851a756c389 WHIRLPOOL 73860d77d41562ab056091e54ee862cff1eda45d8637561ee548ab7ca8dfe486d2d8312d78074e12087a36f4c4235067a911609604616577d3593cdab6c94ae1 DIST dspam-3.10.2.tar.gz 1035054 SHA256 ae76569604021f35b741fb95198a1e611a8c64c3838661973a6cf360bba593a9 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856 WHIRLPOOL 7195f295e786d0b327670ebcb292dc5d9fe98d94e48a5b4e3dd231aae88d55c19dfcf2c04df65bb969fdd8f1210ec125d6aa84d602623cb20964a170f95b880e -EBUILD dspam-3.10.2-r1.ebuild 6091 SHA256 9d5f8559be730467b3b1d9f0426a632b1ed8f5606ae77e9a7ec8c1d61810b832 SHA512 7ab42f01b8eb35fdc30922eb4a48a8546a220240ed8792e97fa8e5fe7e1407d7de95600dfc4743094b287251146d76cbbb27bdf3558765d5317f1c949e43a49c WHIRLPOOL 11d411b925ad42a90dd5a101b290dbef7ded23759c98d9081cc5bf916aacc7064d0f215a53b71beaa7eb56ba006cecf6e6ee63a05282f1e92faf6ee635424079 -MISC ChangeLog 26480 SHA256 02aaeb76fb54db56948d5d3df9dea6801ad5764610b2ca5414253e6e54a4d5e6 SHA512 edbb56df402a2ec2fd52dae1a77fb03e29ef16285b5b76b70387eba8b52a1fdbed54c7dc51d9b83927a216bc868999c9641ca5e5bbc491e8caa7d3adf3b9d444 WHIRLPOOL 8cb64ec105794ed398bea663612b872345b1a673211301977dd2191edc254476f7d87b86c02d904fa05d48668d0bc9bd525e2d65de3af6fd6c07c88cbf25b928 +EBUILD dspam-3.10.2-r1.ebuild 6090 SHA256 eb7398d05eed376886d55be1399b12b69db3e51cd83f8d6fa2b980917fd72202 SHA512 f21eaef0a3d005e2d25eacc69f8b61e6e27b0ff452f0ee238e449e8f0008fd23ec1b9aa60660b49b0909d9c5606465088ba4e3831ed64c07124424e201e3d3ad WHIRLPOOL 1fb3ee8a9a8b84cbe4d214db98c2ce219b43f9eefa17500334784d0a5c9816ff197f5defcd1878abc51e9c8626b867529bb58c79a7f448443969eff89e0b8897 +MISC ChangeLog 26596 SHA256 48cc718f5ac5da356442a56534f447ac1ed22b97b2f23343a4a4e7323f16ed96 SHA512 42941871eb6507082f0217fe9f74292252865e5eb2065c58f3813ffa81da1527baa962ec82dcbf809c59528801b5c853fe28396a6541b65a6d7a09b36f9537e9 WHIRLPOOL d9e94ca6990d0237d47c0d2defd1070e04e95c2f0fdf34a8390071546011dad1e38ac40601ee2b7793cb6b3c9f4d599d66893cd975d902e22487da975c74a5d0 MISC metadata.xml 988 SHA256 f4e606cfc13e00ee42e46fdc32059610d9927605bc4e55c10c02fcb71fa65916 SHA512 6f61b430938b38a7146c94d8a582d527634da55f4d2aec61518fcb259b7e1c83780d38e4c93409dc7b4582f998c2dae428f3796950b37c4ce98fd3c42a5875df WHIRLPOOL afe38ca6ddc7a69bcd2f57cf9e8b162f3b6eaf332ef920dd4528feed7372acfbec8926c8e2e4766669c82c842e2af84098197716825bfbd774107fd21c511e55 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iF4EAREIAAYFAlSgJ34ACgkQVxOqA9G7/aAe6wD/c/N2/v2V25T83vWtpKazIm8W -aMbog6ayWmFm9kP94qgA+QGVHNUSkiAMCbzgBCBAP5Rs40U4DYUMurR23WKsp0QM -=7icB +iQJ8BAEBCgBmBQJVDZ6MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgq8QAINQSNJr7sz5yaMKoMBC037R +7pKRcnNIxz8USVWW4DImlXvj6GNnD583IB38/jiakTLEYVFv1NQW+E9B468VIsCj +y+sAYCXvWePFLFl8s/PSPkeacND5Uc5LcOrgDYwG7d5oaYvXMPeBjl1OBRlbxED+ +Xw2aleJoOfFAMk/iyaoowD+PQhOiP8FPVBzjdPkpOri81M4QNrV9DpkEDTvE5Y9x +MXX8V3ZOihmw0JIKfrMUmOe1+heJwaREYPTzHWu/iLUFAjg0cxz10X+w9jSg4Iw8 +0cWXoVdKJz65m51F38JI7DmCOSzM7O1V+tSf4khBH23i0tyPC2xX5gpECVVXmscT +4A5aDwD+WMtyJVF+TrFzhM/PCtg9jaGjY3Zc0n58m7yEiNlOP/g8AaAdjjl/RGYS +/bYy8aCeZ0iDkz//z89I9HNXWSVtmfsorZk0mbPyzQOYzmvRiUelW4MkDgoiH3++ +ryvNRUZNYXQxa/gax6w2ArAryd45fmYAPCUiMEBPrtnSa4MxLAmSMEbGq1CAK+Zw +/N0od0I+1QC58JdpbrZQHhsBOqX0+pdGiG4XrEaHweC5qpi9mgsBs9CZHBetMkUn +fvFkrulfBKDkAhJOI2zvZ6IZoiKW3Z1iX393KotYzs9sDltqvrID9wZ/OjnzqvlQ +1ZdjmAEiXOkllXvIwDe5 +=OXOu -----END PGP SIGNATURE----- diff --git a/mail-filter/dspam/dspam-3.10.2-r1.ebuild b/mail-filter/dspam/dspam-3.10.2-r1.ebuild index cfe44a7fe0bd..b2247056efc6 100644 --- a/mail-filter/dspam/dspam-3.10.2-r1.ebuild +++ b/mail-filter/dspam/dspam-3.10.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.2-r1.ebuild,v 1.7 2014/12/28 15:53:32 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.10.2-r1.ebuild,v 1.8 2015/03/21 16:38:35 jlec Exp $ EAPI=4 @@ -9,6 +9,7 @@ inherit eutils user DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter" HOMEPAGE="http://dspam.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + LICENSE="AGPL-3" SLOT="0" KEYWORDS="amd64 ~arm ~ppc x86" @@ -23,7 +24,6 @@ DEPEND=" postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) " - RDEPEND=" ${DEPEND} clamav? ( app-antivirus/clamav ) @@ -60,29 +60,29 @@ pkg_setup() { src_configure() { econf \ - --sysconfdir=${DSPAM_CONF} \ - --with-dspam-home=${DSPAM_HOME} \ - --with-dspam-home-group=dspam \ - --with-dspam-mode=${DSPAM_MODE} \ - --with-dspam-group=dspam \ - --with-logdir=${DSPAM_LOG} \ - --enable-external-lookup \ - --enable-long-usernames \ - --enable-split-configuration \ - $(use_enable clamav) \ - $(use_enable daemon) \ - $(use_enable debug) \ - $(use_enable debug bnr-debug) \ - $(use_enable debug verbose-debug) \ - $(use_enable domain-scale) \ - $(use_enable large-scale) \ - $(use_enable static-libs static) \ - $(use_enable syslog) \ - $(use_enable user-homedirs homedir) \ - $(use_enable virtual-users) \ - --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \ - $(use mysql || use postgres && echo "--enable-preferences-extension") \ - $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log") + --sysconfdir=${DSPAM_CONF} \ + --with-dspam-home=${DSPAM_HOME} \ + --with-dspam-home-group=dspam \ + --with-dspam-mode=${DSPAM_MODE} \ + --with-dspam-group=dspam \ + --with-logdir=${DSPAM_LOG} \ + --enable-external-lookup \ + --enable-long-usernames \ + --enable-split-configuration \ + $(use_enable clamav) \ + $(use_enable daemon) \ + $(use_enable debug) \ + $(use_enable debug bnr-debug) \ + $(use_enable debug verbose-debug) \ + $(use_enable domain-scale) \ + $(use_enable large-scale) \ + $(use_enable static-libs static) \ + $(use_enable syslog) \ + $(use_enable user-homedirs homedir) \ + $(use_enable virtual-users) \ + --with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \ + $(use mysql || use postgres && echo "--enable-preferences-extension") \ + $(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log") } dspam_setup_user() { @@ -178,8 +178,7 @@ src_install() { doins "${T}/msgtag.${i}" done - exeinto /usr/bin - newexe contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance + newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance exeinto /etc/cron.daily newexe "${FILESDIR}/dspam.cron-r4" dspam -- 2.26.2