diff options
| -rw-r--r-- | net-fs/samba-libs/ChangeLog | 9 | ||||
| -rw-r--r-- | net-fs/samba-libs/samba-libs-3.3.10.ebuild | 177 | ||||
| -rw-r--r-- | net-fs/samba-libs/samba-libs-3.4.3-r1.ebuild | 286 | ||||
| -rw-r--r-- | net-fs/samba-libs/samba-libs-3.4.3.ebuild | 283 | ||||
| -rw-r--r-- | net-fs/samba-libs/samba-libs-3.4.4.ebuild | 6 |
5 files changed, 188 insertions, 573 deletions
diff --git a/net-fs/samba-libs/ChangeLog b/net-fs/samba-libs/ChangeLog index 9da59e69e5cd..7dcad83c7186 100644 --- a/net-fs/samba-libs/ChangeLog +++ b/net-fs/samba-libs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-fs/samba-libs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.26 2010/01/07 13:51:12 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.27 2010/01/14 12:52:52 patrick Exp $ + +*samba-libs-3.3.10 (14 Jan 2010) + + 14 Jan 2010; Patrick Lauer <patrick@gentoo.org> +samba-libs-3.3.10.ebuild, + -samba-libs-3.4.3.ebuild, -samba-libs-3.4.3-r1.ebuild, + samba-libs-3.4.4.ebuild: + Bump of 3.3, remove old *samba-libs-3.4.4 (07 Jan 2010) diff --git a/net-fs/samba-libs/samba-libs-3.3.10.ebuild b/net-fs/samba-libs/samba-libs-3.3.10.ebuild new file mode 100644 index 000000000000..075f95bfdf1b --- /dev/null +++ b/net-fs/samba-libs/samba-libs-3.3.10.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2010 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.10.ebuild,v 1.1 2010/01/14 12:52:52 patrick Exp $ + +EAPI="2" + +inherit pam confutils versionator multilib + +MY_P="samba-${PV}" + +DESCRIPTION="Libraries from Samba" +HOMEPAGE="http://www.samba.org/" +SRC_URI="mirror://samba/${MY_P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="ads aio caps cluster cups debug examples ldap pam syslog winbind" + +DEPEND="dev-libs/popt + virtual/libiconv + ads? ( virtual/krb5 sys-fs/e2fsprogs ) + caps? ( sys-libs/libcap ) + cluster? ( dev-db/ctdb ) + cups? ( net-print/cups ) + debug? ( dev-libs/dmalloc ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam + winbind? ( dev-libs/iniparser ) ) + syslog? ( virtual/logger ) + !<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 +RESTRICT="test" + +S="${WORKDIR}/${MY_P}/source" + +# TODO: +# - enable iPrint on Prefix/OSX and Darwin? +# - selftest-prefix? selftest? + +CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" + +pkg_setup() { + confutils_use_depend_all ads ldap +} + +src_prepare() { + sed -i \ + -e 's|"lib32" ||' \ + -e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \ + configure || die "sed failed" +} + +src_configure() { + local myconf + + # Filter out -fPIE + [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" + use hppa && myconf="${myconf} --disable-pie" + + # Upstream refuses to make this configurable + use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no + + # Notes: + # - FAM is a plugin for the server + # - DNS-SD is only used in client/server code + # - AFS is a pw-auth-method and only used in client/server code + # - AFSACL is a server module + # - automount is only needed in conjunction with NIS and we don't have that + # anymore + # - quota-support is only needed in server-code + # - acl-support is only used in server-code + # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default + econf ${myconf} \ + --sysconfdir=/etc/samba \ + --localstatedir=/var \ + $(use_enable debug developer) \ + --enable-largefile \ + --enable-socket-wrapper \ + --enable-nss-wrapper \ + --disable-swat \ + $(use_enable debug dmalloc) \ + $(use_enable cups) \ + --disable-iprint \ + --disable-fam \ + --enable-shared-libs \ + --disable-dnssd \ + --disable-avahi \ + --with-fhs \ + --with-privatedir=/var/lib/samba/private \ + --with-rootsbindir=/var/cache/samba \ + --with-lockdir=/var/cache/samba \ + --with-swatdir=/usr/share/doc/${PF}/swat \ + --with-configdir=/etc/samba \ + --with-logfilebase=/var/log/samba \ + --with-pammodulesdir=$(getpam_mod_dir) \ + --without-afs \ + --without-fake-kaserver \ + --without-vfs-afsacl \ + $(use_with ldap) \ + $(use_with ads) \ + $(use_with ads krb5 /usr) \ + $(use_with ads dnsupdate) \ + --without-automount \ + --without-cifsmount \ + --without-cifsupcall \ + $(use_with pam) \ + $(use_with pam pam_smbpass) \ + $(use_with syslog) \ + --without-quotas \ + --without-sys-quotas \ + --without-utmp \ + --with-lib{talloc,tdb,netapi,smbclient,smbsharemodes} \ + --without-libaddns \ + $(use_with cluster ctdb /usr) \ + $(use_with cluster cluster-support) \ + --without-acl-support \ + $(use_with aio aio-support) \ + --with-sendfile-support \ + $(use_with winbind) \ + --without-included-popt \ + --without-included-iniparser +} + +src_compile() { + emake libs pam_modules nss_modules || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" installlibs || die "emake installlibs failed" + if use pam ; then + emake DESTDIR="${D}" installpammodules || die "emake installpammodules failed" + fi + + # Remove empty installation directories + rmdir \ + "${D}/usr/$(get_libdir)/samba" \ + "${D}/usr"/{sbin,bin} \ + "${D}/usr/share"/{man,locale,} \ + "${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ + || die "tried to remove non-empty dirs, this seems like a bug in the ebuild" + + # Nsswitch extensions. Make link for wins and winbind resolvers + if use winbind ; then + dolib.so nsswitch/libnss_wins.so + dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 + dolib.so nsswitch/libnss_winbind.so + dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 + fi + + if use pam ; then + if use winbind ; then + newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind + doman ../docs/manpages/pam_winbind.7 + dohtml ../docs/htmldocs/manpages/pam_winbind.7.html + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins -r ../examples/pam_winbind + fi + fi + + newpamd "${CONFDIR}/samba.pam" samba + dodoc pam_smbpass/README + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins -r ../examples/libsmbclient + + use winbind && doins -r ../examples/nss + fi + +} diff --git a/net-fs/samba-libs/samba-libs-3.4.3-r1.ebuild b/net-fs/samba-libs/samba-libs-3.4.3-r1.ebuild deleted file mode 100644 index 91fbeeb066f9..000000000000 --- a/net-fs/samba-libs/samba-libs-3.4.3-r1.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# 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.4.3-r1.ebuild,v 1.4 2009/11/30 16:03:45 armin76 Exp $ - -EAPI="2" - -inherit pam confutils versionator multilib autotools - -MY_P="samba-${PV}" - -DESCRIPTION="Library bits of the samba network filesystem" -HOMEPAGE="http://www.samba.org/" -SRC_URI="mirror://samba/${MY_P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind - ldb +netapi +smbclient smbsharemodes addns tools" - -DEPEND="dev-libs/popt - sys-libs/talloc - sys-libs/tdb - virtual/libiconv - ads? ( virtual/krb5 sys-fs/e2fsprogs ) - caps? ( sys-libs/libcap ) - cluster? ( dev-db/ctdb ) - cups? ( net-print/cups ) - debug? ( dev-libs/dmalloc ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam - winbind? ( dev-libs/iniparser ) ) - syslog? ( virtual/logger ) - !<net-fs/samba-3.3 - !=net-fs/samba-server-3.4.3[tools]" -# last blocker is only temporary for #288516 - -RDEPEND="${DEPEND}" - -# Disable tests since we don't want to build that much here -RESTRICT="test" - -BINPROGS="" - -if use tools ; then - if use ldb ; then BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; fi -fi - -S="${WORKDIR}/${MY_P}/source3" - -# TODO: -# - enable iPrint on Prefix/OSX and Darwin? -# - selftest-prefix? selftest? - -CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" - -pkg_setup() { - confutils_use_depend_all samba4 ads - confutils_use_depend_all ads ldap -} - -src_prepare() { - - cd ".." - - epatch \ - "${FILESDIR}/samba-3.4.2-missing_includes.patch" \ - "${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \ - "${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch" -# "${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \ - - cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk" - - cd "source3" - eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4 - - # ensure that winbind has correct ldflags (QA notice) - sed -i \ - -e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \ - configure || die "sed failed" -} - -src_configure() { - local myconf - - # compile franky samba4 hybrid - # http://wiki.samba.org/index.php/Franky - if use samba4 ; then - myconf="${myconf} --enable-merged-build --enable-developer" - if has_version app-crypt/heimdal ; then - myconf="${myconf} --with-krb5=/usr/" - elif has_version app-crypt/mit-krb5 ; then - die "MIT Kerberos not supported by samba 4, use heimdal" - else - die "No supported kerberos provider detected" - fi - fi - - # Filter out -fPIE - [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" - use hppa && myconf="${myconf} --disable-pie" - - # Upstream refuses to make this configurable - use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no - - # Notes: - # - FAM is a plugin for the server - # - DNS-SD is only used in client/server code - # - AFS is a pw-auth-method and only used in client/server code - # - AFSACL is a server module - # - automount is only needed in conjunction with NIS and we don't have that - # anymore - # - quota-support is only needed in server-code - # - acl-support is only used in server-code - # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default - econf ${myconf} \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - $(use_enable debug developer) \ - --enable-largefile \ - --enable-socket-wrapper \ - --enable-nss-wrapper \ - --disable-swat \ - $(use_enable debug dmalloc) \ - $(use_enable cups) \ - --disable-iprint \ - --disable-fam \ - --enable-shared-libs \ - --disable-dnssd \ - --disable-avahi \ - --with-fhs \ - --with-privatedir=/var/lib/samba/private \ - --with-rootsbindir=/var/cache/samba \ - --with-lockdir=/var/cache/samba \ - --with-swatdir=/usr/share/doc/${PF}/swat \ - --with-configdir=/etc/samba \ - --with-logfilebase=/var/log/samba \ - --with-pammodulesdir=$(getpam_mod_dir) \ - --without-afs \ - --without-fake-kaserver \ - --without-vfs-afsacl \ - $(use_with ldap) \ - $(use_with ads) \ - $(use_with ads krb5 /usr) \ - $(use_with ads dnsupdate) \ - --without-automount \ - --without-cifsmount \ - --without-cifsupcall \ - $(use_with pam) \ - $(use_with pam pam_smbpass) \ - $(use_with syslog) \ - --without-quotas \ - --without-sys-quotas \ - --without-utmp \ - --without-libtdb \ - $(use_with netapi libnetapi) \ - --without-libtalloc \ - $(use_with smbclient libsmbclient) \ - $(use_with smbsharemodes libsmbsharemodes) \ - $(use_with addns libaddns) \ - $(use_with cluster ctdb /usr) \ - $(use_with cluster cluster-support) \ - --without-acl-support \ - $(use_with aio aio-support) \ - --with-sendfile-support \ - $(use_with winbind) \ - --without-included-popt \ - --without-included-iniparser -} - -src_compile() { - - # compile libs - if use addns ; then - einfo "make addns library" - emake libaddns || die "emake libaddns failed" - fi - if use netapi ; then - einfo "make netapi library" - emake libnetapi || die "emake libnetapi failed" - fi - if use smbclient ; then - einfo "make smbclient library" - emake libsmbclient || die "emake libsmbclient failed" - fi - if use smbsharemodes ; then - einfo "make smbsharemodes library" - emake libsmbsharemodes || die "emake libsmbsharemodes failed" - fi - - # compile modules - if use pam ; then - einfo "make pam modules" - emake pam_modules || die "emake pam_modules failed"; - fi - if use winbind ; then - einfo "make nss modules" - emake nss_modules || die "emake nss_modules failed"; - fi - - # compile utilities - if use tools ; then - einfo "make utilities" - emake ${BINPROGS} || die "emake binprogs failed"; - fi - -} - -src_install() { - - # install libs - if use netapi ; then - einfo "install netapi library" - emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed" - fi - if use smbclient ; then - einfo "install smbclient library" - emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed" - fi - if use smbsharemodes ; then - einfo "install smbsharemodes library" - emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed" - fi - if use addns ; then - einfo "install addns library" - emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed" - fi - - # install modules - if use pam ; then - einfo "install pam modules" - emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed" - fi - - # Remove empty installation directories - rmdir \ - "${D}/usr/$(get_libdir)/samba" \ - "${D}/usr"/{sbin,bin} \ - "${D}/usr/share"/{man,locale,} \ - "${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ - # || die "tried to remove non-empty dirs, this seems like a bug in the ebuild" - - # Nsswitch extensions. Make link for wins and winbind resolvers - if use winbind ; then - einfo "install lbwbclient" - emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed" - dolib.so ../nsswitch/libnss_wins.so - dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 - dolib.so ../nsswitch/libnss_winbind.so - dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 - fi - - if use pam ; then - if use winbind ; then - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind - doman ../docs/manpages/pam_winbind.8 - dohtml ../docs/htmldocs/manpages/pam_winbind.8.html - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins -r ../examples/pam_winbind - fi - fi - - newpamd "${CONFDIR}/samba.pam" samba - dodoc pam_smbpass/README - fi - - # install utilities - if use tools && [[ -n "${BINPROGS}" ]] ; then - einfo "install utilities" - dobin ${BINPROGS} || die "not all bins around" - for prog in ${BINPROGS} ; do - doman ../docs/manpages/${prog/bin\/}* || die "doman failed" - dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed" - done - fi - - # install examples - if use examples ; then - einfo "install examples" - insinto /usr/share/doc/${PF}/examples - doins -r ../examples/libsmbclient - use winbind && doins -r ../examples/nss - fi - -} diff --git a/net-fs/samba-libs/samba-libs-3.4.3.ebuild b/net-fs/samba-libs/samba-libs-3.4.3.ebuild deleted file mode 100644 index e86dddee15ef..000000000000 --- a/net-fs/samba-libs/samba-libs-3.4.3.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# 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.4.3.ebuild,v 1.2 2009/11/08 03:27:34 josejx Exp $ - -EAPI="2" - -inherit pam confutils versionator multilib autotools - -MY_P="samba-${PV}" - -DESCRIPTION="Library bits of the samba network filesystem" -HOMEPAGE="http://www.samba.org/" -SRC_URI="mirror://samba/${MY_P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="samba4 ads aio caps cluster cups debug examples ldap pam syslog winbind - +netapi +smbclient smbsharemodes addns tools" - -DEPEND="dev-libs/popt - sys-libs/talloc - sys-libs/tdb - virtual/libiconv - ads? ( virtual/krb5 sys-fs/e2fsprogs ) - caps? ( sys-libs/libcap ) - cluster? ( dev-db/ctdb ) - cups? ( net-print/cups ) - debug? ( dev-libs/dmalloc ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam - winbind? ( dev-libs/iniparser ) ) - syslog? ( virtual/logger ) - !<net-fs/samba-3.3" -RDEPEND="${DEPEND}" - -# Disable tests since we don't want to build that much here -RESTRICT="test" - -BINPROGS="" - -if use tools ; then - if use samba4 ; then BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; fi -fi - -S="${WORKDIR}/${MY_P}/source3" - -# TODO: -# - enable iPrint on Prefix/OSX and Darwin? -# - selftest-prefix? selftest? - -CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" - -pkg_setup() { - confutils_use_depend_all samba4 ads - confutils_use_depend_all ads ldap -} - -src_prepare() { - - cd ".." - - epatch \ - "${FILESDIR}/samba-3.4.2-missing_includes.patch" \ - "${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \ - "${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch" -# "${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \ - - cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk" - - cd "source3" - eautoconf -Ilibreplace -Im4 -I../m4 -I../lib/replace -I../source4 - - # ensure that winbind has correct ldflags (QA notice) - sed -i \ - -e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \ - configure || die "sed failed" -} - -src_configure() { - local myconf - - # compile franky samba4 hybrid - # http://wiki.samba.org/index.php/Franky - if use samba4 ; then - myconf="${myconf} --enable-merged-build --enable-developer" - if has_version app-crypt/heimdal ; then - myconf="${myconf} --with-krb5=/usr/" - elif has_version app-crypt/mit-krb5 ; then - die "MIT Kerberos not supported by samba 4, use heimdal" - else - die "No supported kerberos provider detected" - fi - fi - - # Filter out -fPIE - [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" - use hppa && myconf="${myconf} --disable-pie" - - # Upstream refuses to make this configurable - use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no - - # Notes: - # - FAM is a plugin for the server - # - DNS-SD is only used in client/server code - # - AFS is a pw-auth-method and only used in client/server code - # - AFSACL is a server module - # - automount is only needed in conjunction with NIS and we don't have that - # anymore - # - quota-support is only needed in server-code - # - acl-support is only used in server-code - # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default - econf ${myconf} \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - $(use_enable debug developer) \ - --enable-largefile \ - --enable-socket-wrapper \ - --enable-nss-wrapper \ - --disable-swat \ - $(use_enable debug dmalloc) \ - $(use_enable cups) \ - --disable-iprint \ - --disable-fam \ - --enable-shared-libs \ - --disable-dnssd \ - --disable-avahi \ - --with-fhs \ - --with-privatedir=/var/lib/samba/private \ - --with-rootsbindir=/var/cache/samba \ - --with-lockdir=/var/cache/samba \ - --with-swatdir=/usr/share/doc/${PF}/swat \ - --with-configdir=/etc/samba \ - --with-logfilebase=/var/log/samba \ - --with-pammodulesdir=$(getpam_mod_dir) \ - --without-afs \ - --without-fake-kaserver \ - --without-vfs-afsacl \ - $(use_with ldap) \ - $(use_with ads) \ - $(use_with ads krb5 /usr) \ - $(use_with ads dnsupdate) \ - --without-automount \ - --without-cifsmount \ - --without-cifsupcall \ - $(use_with pam) \ - $(use_with pam pam_smbpass) \ - $(use_with syslog) \ - --without-quotas \ - --without-sys-quotas \ - --without-utmp \ - --without-libtdb \ - $(use_with netapi libnetapi) \ - --without-libtalloc \ - $(use_with smbclient libsmbclient) \ - $(use_with smbsharemodes libsmbsharemodes) \ - $(use_with addns libaddns) \ - $(use_with cluster ctdb /usr) \ - $(use_with cluster cluster-support) \ - --without-acl-support \ - $(use_with aio aio-support) \ - --with-sendfile-support \ - $(use_with winbind) \ - --without-included-popt \ - --without-included-iniparser -} - -src_compile() { - - # compile libs - if use addns ; then - einfo "make addns library" - emake libaddns || die "emake libaddns failed" - fi - if use netapi ; then - einfo "make netapi library" - emake libnetapi || die "emake libnetapi failed" - fi - if use smbclient ; then - einfo "make smbclient library" - emake libsmbclient || die "emake libsmbclient failed" - fi - if use smbsharemodes ; then - einfo "make smbsharemodes library" - emake libsmbsharemodes || die "emake libsmbsharemodes failed" - fi - - # compile modules - if use pam ; then - einfo "make pam modules" - emake pam_modules || die "emake pam_modules failed"; - fi - if use winbind ; then - einfo "make nss modules" - emake nss_modules || die "emake nss_modules failed"; - fi - - # compile utilities - if use tools ; then - einfo "make utilities" - emake ${BINPROGS} || die "emake binprogs failed"; - fi - -} - -src_install() { - - # install libs - if use netapi ; then - einfo "install netapi library" - emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed" - fi - if use smbclient ; then - einfo "install smbclient library" - emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed" - fi - if use smbsharemodes ; then - einfo "install smbsharemodes library" - emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed" - fi - if use addns ; then - einfo "install addns library" - emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed" - fi - - # install modules - if use pam ; then - einfo "install pam modules" - emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed" - fi - - # Remove empty installation directories - rmdir \ - "${D}/usr/$(get_libdir)/samba" \ - "${D}/usr"/{sbin,bin} \ - "${D}/usr/share"/{man,locale,} \ - "${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ - # || die "tried to remove non-empty dirs, this seems like a bug in the ebuild" - - # Nsswitch extensions. Make link for wins and winbind resolvers - if use winbind ; then - einfo "install lbwbclient" - emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed" - dolib.so ../nsswitch/libnss_wins.so - dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 - dolib.so ../nsswitch/libnss_winbind.so - dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 - fi - - if use pam ; then - if use winbind ; then - newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind - doman ../docs/manpages/pam_winbind.8 - dohtml ../docs/htmldocs/manpages/pam_winbind.8.html - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins -r ../examples/pam_winbind - fi - fi - - newpamd "${CONFDIR}/samba.pam" samba - dodoc pam_smbpass/README - fi - - # install utilities - if use tools && [[ -n "${BINPROGS}" ]] ; then - einfo "install utilities" - dobin ${BINPROGS} || die "not all bins around" - for prog in ${BINPROGS} ; do - doman ../docs/manpages/${prog/bin\/}* || die "doman failed" - dohtml ../docs/htmldocs/manpages/${prog/bin\/}*.html || die "dohtml failed" - done - fi - - # install examples - if use examples ; then - einfo "install examples" - insinto /usr/share/doc/${PF}/examples - doins -r ../examples/libsmbclient - use winbind && doins -r ../examples/nss - fi - -} diff --git a/net-fs/samba-libs/samba-libs-3.4.4.ebuild b/net-fs/samba-libs/samba-libs-3.4.4.ebuild index 23e103f501dd..b8a54acafb54 100644 --- a/net-fs/samba-libs/samba-libs-3.4.4.ebuild +++ b/net-fs/samba-libs/samba-libs-3.4.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.4.4.ebuild,v 1.1 2010/01/07 13:51:12 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.4.4.ebuild,v 1.2 2010/01/14 12:52:52 patrick Exp $ EAPI="2" @@ -65,8 +65,8 @@ src_prepare() { epatch \ "${FILESDIR}/samba-3.4.2-missing_includes.patch" \ "${FILESDIR}/samba-3.4.2-fix-samba4-automake.patch" \ - "${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch" -# "${FILESDIR}/samba-3.4.2-upgrade-tevent-version.patch" \ + "${FILESDIR}/samba-3.4.2-insert-AC_LD_VERSIONSCRIPT.patch" \ + "${FILESDIR}/samba-3.4.4-version.h.patch" cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "lib/tevent/python.mk" |