Install storage drivers in $(libdir)/dspam (bug #172756 comment #3). Use get_libdir...

Package-Manager: portage-2.1.2.3

diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index fabd35f8e4bce2a1e0b5a7c666a122f6653e586a..9f7a66f9aca66bc25bf83b6ea7714d90863d7739 100644 (file)
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-filter/dspam
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.87 2007/04/17 08:11:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.88 2007/04/18 11:03:03 mrness Exp $
+
+*dspam-3.8.0-r1 (18 Apr 2007)
+
+  18 Apr 2007; Alin Năstac <mrness@gentoo.org> -dspam-3.8.0.ebuild,
+  +dspam-3.8.0-r1.ebuild:
+  Install storage drivers in $(libdir)/dspam (bug #172756 comment #3). Use
+  get_libdir() for mysql and postgresql library paths. Re-add qa-fixes patch
+  renamed as ldap-deprecated.
 
 *dspam-3.8.0 (17 Apr 2007)
 

diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index f38da429eb1c7bd2f553c99769581a8e6f9cd2ba..a1294d02d4f72b5292548dbf13039ba433151340 100644 (file)
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -27,21 +27,21 @@ RMD160 256f2607b275336f944b0882591366c39b53daf7 files/logrotate.dspam 156
 SHA256 75e04139e564ad55011ee77b8245dc5cdefbb6d56ca451feab5861ab907d614e files/logrotate.dspam 156
 DIST dspam-3.6.8-patches-20070322.tar.gz 5518 RMD160 76bc1194891527da5c221f0f8d33b806911e288b SHA1 4a13338009f849fe928eae7ca6b7d3fb72103732 SHA256 3f38801f4437053e71ccde146c62b1af0adb5be6bd7d7d34914565160ba00df4
 DIST dspam-3.6.8.tar.gz 743275 RMD160 93a70db14070cb61bd2ef1b0ca55a18be1dbfd7b SHA1 e8c413882eadf1e02837e4a2ffcfc98b801eded1 SHA256 88c7b41fb81e90ba8a260885a1d14bce39f2ef4a06cc2c6b8bfa0b99ba1aec34
-DIST dspam-3.8.0-patches-20070416.tar.gz 7062 RMD160 05d6d294edab5f4ca058aa9daf5c3d9c69ddd91c SHA1 f71080f39b3f11e654c708651885bd622866e1df SHA256 9cc2d1cf1482ceff124a9017910bb6c3a7ed0be828e2d3c6c83b08e6b871a649
+DIST dspam-3.8.0-patches-20070418.tar.gz 7688 RMD160 e1f0d0d1a67f917352e19ec11763e743c6791f43 SHA1 3768946442c22679835c66cee34176b29db7f762 SHA256 f0e1c523205833bf1cdbedec16039fafedf9e802f4da6faa859f14411819b27a
 DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 SHA1 d1de7ee2134522adaf52f49167accecf1589fa96 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
 DIST dspam_sa_trainer.tar.gz 1230 RMD160 c3d0fca7169d23ecf9d44c850ee255b42d97d818 SHA1 71a002f26a888bdfe47759cf1f780cd6478dacac SHA256 8fb6b1ebe592acf00a028737ef8e174544af166768b987d29048b2319bc5a215
 EBUILD dspam-3.6.8-r3.ebuild 17130 RMD160 9a913710930d24d9a79af111b1ab8973b17e8f74 SHA1 460905f7ceede56e7e381995dd2fd82f59447f5c SHA256 6b55ff04c1080314f4e3e6b95fd3d692154a7ae98121f1ee83d1b51aa9d04d31
 MD5 61e46c0895f070b706d4c6ca3bd15140 dspam-3.6.8-r3.ebuild 17130
 RMD160 9a913710930d24d9a79af111b1ab8973b17e8f74 dspam-3.6.8-r3.ebuild 17130
 SHA256 6b55ff04c1080314f4e3e6b95fd3d692154a7ae98121f1ee83d1b51aa9d04d31 dspam-3.6.8-r3.ebuild 17130
-EBUILD dspam-3.8.0.ebuild 15122 RMD160 a0e8dc6deebb99f4dece2800cda754800a62daf0 SHA1 b9bfe297e75dda6c0ff95d1e80b71d8926638e8d SHA256 c585684c9cae2ebe5ddfd5029f915f556222c1a0d9f9322c60292f7ca123c2c5
-MD5 5706e2eebbf006a3d0c41568d954b9e8 dspam-3.8.0.ebuild 15122
-RMD160 a0e8dc6deebb99f4dece2800cda754800a62daf0 dspam-3.8.0.ebuild 15122
-SHA256 c585684c9cae2ebe5ddfd5029f915f556222c1a0d9f9322c60292f7ca123c2c5 dspam-3.8.0.ebuild 15122
-MISC ChangeLog 15600 RMD160 11addad729b95c242f6c4589a48c2c1b1a916e97 SHA1 4fd5ecd4e929b4963e55586b1193b7e273c386a5 SHA256 d4e2bb10b84a03a6f35d468374770269ec2a684b8d792ae7100ae04b76d16037
-MD5 2b3a7263157f374578a1450059790e43 ChangeLog 15600
-RMD160 11addad729b95c242f6c4589a48c2c1b1a916e97 ChangeLog 15600
-SHA256 d4e2bb10b84a03a6f35d468374770269ec2a684b8d792ae7100ae04b76d16037 ChangeLog 15600
+EBUILD dspam-3.8.0-r1.ebuild 15034 RMD160 a60502a5e8bf07312cb2b13e58a9fc1ed99fab8e SHA1 98da966a38a86af51206d1137890064fcbcbd114 SHA256 5a35a113c8ec6551753e40b5d61359bbf2d39aa8a0388990749baf556f32cfed
+MD5 c2226cc40c2db76b80607ec898e2771f dspam-3.8.0-r1.ebuild 15034
+RMD160 a60502a5e8bf07312cb2b13e58a9fc1ed99fab8e dspam-3.8.0-r1.ebuild 15034
+SHA256 5a35a113c8ec6551753e40b5d61359bbf2d39aa8a0388990749baf556f32cfed dspam-3.8.0-r1.ebuild 15034
+MISC ChangeLog 15909 RMD160 2ddceba25511aa4382313a43a93c6d0ed2fde417 SHA1 9cf000eb4994f7def836c2d7ec11a029886db001 SHA256 3e808dd49a28ef2105010e100e553a26911b95cb395b9f3d59d36b7cc0276c3d
+MD5 ccb7c1c4febdbca06f97172fffa7c9f8 ChangeLog 15909
+RMD160 2ddceba25511aa4382313a43a93c6d0ed2fde417 ChangeLog 15909
+SHA256 3e808dd49a28ef2105010e100e553a26911b95cb395b9f3d59d36b7cc0276c3d ChangeLog 15909
 MISC metadata.xml 335 RMD160 acb18f015dcada8300ffce56be0c4a285ce2a215 SHA1 87ddabb196434e9e9363ba4b5b5596b78aa463f1 SHA256 23816215482cfc089c2e3fe9ae75547c364ad01fbb2a98886ad91d28f5971e17
 MD5 47349dfc68ef142782e134a2e7696a37 metadata.xml 335
 RMD160 acb18f015dcada8300ffce56be0c4a285ce2a215 metadata.xml 335
@@ -49,13 +49,13 @@ SHA256 23816215482cfc089c2e3fe9ae75547c364ad01fbb2a98886ad91d28f5971e17 metadata
 MD5 70bb8cee0421ab362030f6820112e350 files/digest-dspam-3.6.8-r3 759
 RMD160 aeb37fa95434477546b28ff8c7edecec216f28bc files/digest-dspam-3.6.8-r3 759
 SHA256 d7d4d1f5c8b678914be3b634fd9d775032e2f80de07ec153b17505463bfc1b36 files/digest-dspam-3.6.8-r3 759
-MD5 aa8d15fb95ae7874e5257d4ba2d26a12 files/digest-dspam-3.8.0 759
-RMD160 34ffbeec1fde9939a536496bd3f78a35a4851382 files/digest-dspam-3.8.0 759
-SHA256 d1fcb86334be0e078dbcd8322f7b543931dbdc40969dda6dce32716e52aa6870 files/digest-dspam-3.8.0 759
+MD5 a50a19a5dacce4108a5ddc1f1601fa49 files/digest-dspam-3.8.0-r1 759
+RMD160 77f651a7322bd224ee0d32b976dfaee46f007df5 files/digest-dspam-3.8.0-r1 759
+SHA256 d942346fb5a650ccf135ccb9b98231dc447d90d0b41e38e1b2e53ed0cb3ebfdf files/digest-dspam-3.8.0-r1 759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJIFDJnxX6mF440QRAkMgAKD6E2wJ6XGbw+nX85OgHx3wWCm00wCg47wx
-vVwwN2IkiQieCjLeErUSIE0=
-=F5y6
+iD8DBQFGJfrzJnxX6mF440QRAgbXAJ45zEjrDmp404llTMHjwyeVbCDHxACglGJ+
+S9YyEHeyyN5D60gYhX0rESg=
+=5QCe
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/dspam/dspam-3.8.0.ebuild b/mail-filter/dspam/dspam-3.8.0-r1.ebuild
similarity index 97%
rename from mail-filter/dspam/dspam-3.8.0.ebuild
rename to mail-filter/dspam/dspam-3.8.0-r1.ebuild
index d9792763c11d5c7aa5db93b2ef8a6dce40a7551f..b672abdf5e81fee7a87e45ac8f05030718012815 100644 (file)
--- a/mail-filter/dspam/dspam-3.8.0.ebuild
+++ b/mail-filter/dspam/dspam-3.8.0-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0.ebuild,v 1.1 2007/04/17 08:11:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r1.ebuild,v 1.1 2007/04/18 11:03:03 mrness Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit eutils autotools flag-o-matic
+inherit eutils autotools flag-o-matic multilib
 
 DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
-       mirror://gentoo/${P}-patches-20070416.tar.gz
+       mirror://gentoo/${P}-patches-20070418.tar.gz
        http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
 
 LICENSE="GPL-2"
@@ -109,13 +109,13 @@ src_compile() {
                if [ "$STORAGE" ] ; then STORAGE="${STORAGE}," ; fi
                STORAGE="${STORAGE}mysql_drv"
                myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
-               myconf="${myconf} --with-mysql-libraries=/usr/lib/mysql"
+               myconf="${myconf} --with-mysql-libraries=/usr/$(get_libdir)/mysql"
        fi
        if use postgres ; then
                if [ "$STORAGE" ] ; then STORAGE="${STORAGE}," ; fi
                STORAGE="${STORAGE}pgsql_drv"
                myconf="${myconf} --with-pgsql-includes=/usr/include/postgresql"
-               myconf="${myconf} --with-pgsql-libraries=/usr/lib/postgresql"
+               myconf="${myconf} --with-pgsql-libraries=/usr/$(get_libdir)/postgresql"
        fi
        if [[ -z "${STORAGE}" ]]; then
                STORAGE="${STORAGE}hash_drv"
@@ -146,11 +146,6 @@ src_install () {
        # make install
        make DESTDIR="${D}" install || die "make install failed"
 
-       dodir /usr/lib/dspam
-       if [[ "${D}"/usr/lib/*drv* != *"*" ]]; then
-               mv "${D}"/usr/lib/*drv* "${D}"/usr/lib/dspam/
-       fi
-
        diropts -m0755 -o dspam -g dspam
        keepdir /var/run/dspam
 

diff --git a/mail-filter/dspam/files/digest-dspam-3.8.0 b/mail-filter/dspam/files/digest-dspam-3.8.0-r1
similarity index 63%
rename from mail-filter/dspam/files/digest-dspam-3.8.0
rename to mail-filter/dspam/files/digest-dspam-3.8.0-r1
index 463a04ecb8db9f1476a0542395333da328b5047f..4ae7b9e258f735f7045b05f2937544498642dbea 100644 (file)
--- a/mail-filter/dspam/files/digest-dspam-3.8.0
+++ b/mail-filter/dspam/files/digest-dspam-3.8.0-r1
@@ -1,6 +1,6 @@
-MD5 11861e3b89a6e2554c65ab185260dc3e dspam-3.8.0-patches-20070416.tar.gz 7062
-RMD160 05d6d294edab5f4ca058aa9daf5c3d9c69ddd91c dspam-3.8.0-patches-20070416.tar.gz 7062
-SHA256 9cc2d1cf1482ceff124a9017910bb6c3a7ed0be828e2d3c6c83b08e6b871a649 dspam-3.8.0-patches-20070416.tar.gz 7062
+MD5 1e0848291117bba17969d02bd72801a0 dspam-3.8.0-patches-20070418.tar.gz 7688
+RMD160 e1f0d0d1a67f917352e19ec11763e743c6791f43 dspam-3.8.0-patches-20070418.tar.gz 7688
+SHA256 f0e1c523205833bf1cdbedec16039fafedf9e802f4da6faa859f14411819b27a dspam-3.8.0-patches-20070418.tar.gz 7688
 MD5 056b8c8b3ad9415a52c01b22ff1e64cf dspam-3.8.0.tar.gz 726160
 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 dspam-3.8.0.tar.gz 726160
 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7 dspam-3.8.0.tar.gz 726160