diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-10-11 12:01:23 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-10-11 12:01:23 +0000 |
| commit | bb10741f15b2f2cc8d8ab4eb089d4751372adf30 (patch) | |
| tree | b19cf88acac8455fbe5dbd6a87f4170147cf9b83 | |
| parent | whitespace (diff) | |
| download | historical-bb10741f15b2f2cc8d8ab4eb089d4751372adf30.tar.gz historical-bb10741f15b2f2cc8d8ab4eb089d4751372adf30.tar.bz2 historical-bb10741f15b2f2cc8d8ab4eb089d4751372adf30.zip | |
Add blockers for collision with sys-libs/tdb and sys-libs/talloc. Fixes bug #288545.
Package-Manager: portage-2.2_rc45/cvs/Linux i686
| -rw-r--r-- | net-fs/samba-libs/ChangeLog | 7 | ||||
| -rw-r--r-- | net-fs/samba-libs/Manifest | 14 | ||||
| -rw-r--r-- | net-fs/samba-libs/samba-libs-3.3.8.ebuild | 6 |
3 files changed, 22 insertions, 5 deletions
diff --git a/net-fs/samba-libs/ChangeLog b/net-fs/samba-libs/ChangeLog index ff54a7defdde..f0bc71ed4108 100644 --- a/net-fs/samba-libs/ChangeLog +++ b/net-fs/samba-libs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/samba-libs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.12 2009/10/11 11:11:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.13 2009/10/11 12:01:23 betelgeuse Exp $ + + 11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> + samba-libs-3.3.8.ebuild: + Add blockers for collision with sys-libs/tdb and sys-libs/talloc. Fixes + bug #288545. 11 Oct 2009; Patrick Lauer <patrick@gentoo.org> samba-libs-3.4.2.ebuild: Enable smbclient by default, used by most dependencies diff --git a/net-fs/samba-libs/Manifest b/net-fs/samba-libs/Manifest index 420dfcb407e8..dbbc6ac56312 100644 --- a/net-fs/samba-libs/Manifest +++ b/net-fs/samba-libs/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 3.3/nsswitch.conf-winbind 411 RMD160 0266acf875557b3332550aa0d8e68510deb55ed0 SHA1 35ba35a57f88daa26ef5aa79ccabe81317eb9d06 SHA256 e83deeaeb64e3c7b907ef7a27e280ce1c777b51ca6e93da226424954ea22b83e AUX 3.3/nsswitch.conf-wins 397 RMD160 8dad352a86a242c1ad81561d478701f88f1b7a29 SHA1 f72680b3071f5f9f0157af06be947374b5498821 SHA256 70a4253546718aa02ec02b7cbb1470807ff08eeaf36626b040fb999362bfba2a AUX 3.3/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38 @@ -14,7 +17,14 @@ AUX samba-3.4.2-missing_includes.patch 293 RMD160 e32b75ddc4a35f20173db731681eae AUX samba-3.4.2-upgrade-tevent-version.patch 288 RMD160 3eb9bbd781d4a92e844ff36824b75f6345c11a97 SHA1 6eec152408b8c18459a7d9413134bc37a6d52b63 SHA256 9171d875322387e7b4f4905067d9310da8e82e9c17cc7d0f0df7d163cffbf414 DIST samba-3.3.8.tar.gz 26100617 RMD160 cef20f2be0b93575b090735570b3dd35e9c3c085 SHA1 8ec485e12227e3d1a1fa63e61605c5e2adb3c43e SHA256 3bd0bd525bdeebe5c3d795ab6c6c335d0e5d131c6ea0b01a392c26a9103292d2 DIST samba-3.4.2.tar.gz 34979734 RMD160 741456633afeacccb1942089b9d759ac073d2562 SHA1 4077302ed27b6d9f50bbcfba58ca6a58fe9d0f59 SHA256 8b880e78d175a82df627d61a070461812bba209b21346aa0383cd5c96d364fc4 -EBUILD samba-libs-3.3.8.ebuild 4892 RMD160 9aec8ab6cea85825b6d08d5bbce1beabfd5471e0 SHA1 6678fee9f10aeaad48fce27cf893e1e18c6eff60 SHA256 dc5b0929f37fc1c5c199327bc30d0bc589bd866dcb146f9dff85bda6f9b0426f +EBUILD samba-libs-3.3.8.ebuild 4928 RMD160 68d595412a9ab280a5d430124fa9ef91b0be59d4 SHA1 c7fe9b50460dbcad184009146fbd2016999496d4 SHA256 78d25ae420664b194528227888d67dfac3f100e1781fa01d7a1c8741f9ed8140 EBUILD samba-libs-3.4.2.ebuild 9839 RMD160 757d70a6564f991814f0f7ed12920e568f0355e8 SHA1 cb743c1f5b1af26ebcd9a2f88d9ba8628bd89d99 SHA256 8ae2d2875c0caebe1f347f2f6d5e5c828b96ea60bfcfd514ea750a06b8c65f28 -MISC ChangeLog 2391 RMD160 d2ffd2cbffa9ff4b465ed075f2a35715c4494d30 SHA1 5459b02a7933b6f290961769b303a181a6b3db39 SHA256 f31d47f13526a2d2fb0223ee40011ba9ae59fdcb4583107b920a2ad142a64e37 +MISC ChangeLog 2564 RMD160 5fffb53f58314742fbeb66e1d99e9560b7be4741 SHA1 c67b8aa7afaf14f0c7b4e503575b90120542bb9f SHA256 7d3100b34dfc22677eacfde6a5cd331869ee3f20b87aa3509ad6d3f6beb25bdf MISC metadata.xml 1200 RMD160 439dba15343b4af422befd72851cae490dd08c0d SHA1 34e73c6750626193e9ed1a456985dde7380348e0 SHA256 fe768fb8c50b91d029bce1c486a1cf447b92be2a22e3376f5951b48647e34554 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkrRyRwACgkQcxLzpIGCsLToDwCghhfQQxbnKUdjkoY7hC9l43Lm +hzIAn17oJcTkRybYCWwIu22MD6cReaIa +=Qedp +-----END PGP SIGNATURE----- diff --git a/net-fs/samba-libs/samba-libs-3.3.8.ebuild b/net-fs/samba-libs/samba-libs-3.3.8.ebuild index fdf4eed86843..bcda54778d06 100644 --- a/net-fs/samba-libs/samba-libs-3.3.8.ebuild +++ b/net-fs/samba-libs/samba-libs-3.3.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.8.ebuild,v 1.2 2009/10/09 17:21:09 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.8.ebuild,v 1.3 2009/10/11 12:01:23 betelgeuse Exp $ EAPI="2" @@ -27,7 +27,9 @@ DEPEND="dev-libs/popt pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) syslog? ( virtual/logger ) - !<net-fs/samba-3.3" + !<net-fs/samba-3.3 + !sys-libs/tdb + !sys-libs/talloc" RDEPEND="${DEPEND}" # Disable tests since we don't want to build that much here |