Migrate to eapi4

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 55 insertions, 43 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 06d49c38f334..c43d2dde9d22 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.467 2011/03/23 11:04:30 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.468 2011/05/03 15:26:29 scarabeus Exp $
+
+  03 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> samba-3.5.8-r1.ebuild:
+  Migrate to eapi4
 
 *samba-3.5.8-r1 (23 Mar 2011)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 63af542d0afe..8cf6a85d16a0 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.4/lmhosts 126 RMD160 c4ff63cf01158809311c97c768463826aa02127b SHA1 2d5be4b38357287050b25bbd9fdc3263801676ce SHA256 b4b9cad6cd728dac260f4716270bb5df09da5c84c76526ccbe6cccdb8818c56c
 AUX 3.4/nsswitch.conf-winbind 406 RMD160 7bbc3f7a4bdc4907bc45ad71fc0e17cc376d4e1e SHA1 0cd4966690d98802de94f0353ecf760c1a6d5245 SHA256 342657852ec465f78b1450a522211c2102ee07a65f8cb167a19ca5e277220867
 AUX 3.4/nsswitch.conf-wins 392 RMD160 bf1c0b6c3128be82a3f901eb3ef70d6d621df334 SHA1 2742757c188bfeae94d272eed66405e1a5417540 SHA256 508f76bc1abe15b49ef97b6033ae873f6d630bbcb99cd69b9babe55dc2554ea0
@@ -31,8 +34,15 @@ DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d
 EBUILD samba-3.4.12.ebuild 11861 RMD160 750f8afe059cdc815a5c1cefda7539ff7ca28969 SHA1 ef4a379e61668d63b100f4ec962ab89e890dd3ca SHA256 f7308d692377f503e4ee60927508a29645ca5b6a6cbfafa659a053a5b77cf194
 EBUILD samba-3.4.9.ebuild 11819 RMD160 b190b483b2cf1291a209b55c4717635bcdd9b056 SHA1 77fd940d2d182fe16b35fb67cf662da16a6cd103 SHA256 c03939f60782a74b50532ed4cad936ffa595392ad2529f897f49dd9407210263
 EBUILD samba-3.5.7.ebuild 12721 RMD160 40ae76d07c6aad5ef12fd1542394dad01cc69979 SHA1 a47b572132f9724f70f685ace260696154c67da7 SHA256 8d9c3f5da0a9f336533a03d64717fb054458e68e28d96049b79bf956452819a3
-EBUILD samba-3.5.8-r1.ebuild 12950 RMD160 945ed915be88b8cec2bc341e50ee4ee3f77a284f SHA1 7035892773440bebaffcae2bbcc0726bebcc31fa SHA256 19c11c7ad5d30f4a7f1546d55f2d1465c5136b2994a50e5da1063296b9702a9e
+EBUILD samba-3.5.8-r1.ebuild 11885 RMD160 59ad1f6548e5e57219b97e44bce440a869fe5fe4 SHA1 f9fc1aa2cf41ebffbf0377d3df9a693aca522d83 SHA256 9c1c15fe0ad92bffc60826718957e5e75a4e2338e1e2b425e8bad93e6e585c49
 EBUILD samba-3.5.8.ebuild 12729 RMD160 88956016de7cca429a9fc56993bfb43b634b3ac0 SHA1 09011aa0e312be1be93e05c75c4bb6fc5b160a37 SHA256 03118d35562237cf15ae20beb201505a9cab39c1eab3652ea65635d9110437d0
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 78020 RMD160 b84297e591f9d37d28569d2a9815d810230cd9cf SHA1 026c31880d4d638d46a63f2fd6746ea33497c446 SHA256 45f5c46655cecbcbdd4738b8aa1d3eb4bb11cf6a442efb78a92606adc139a5c3
+MISC ChangeLog 78121 RMD160 286378a2445866210db9c480b7eaf1c85abd716b SHA1 a8663ef18ac3e2ab8a6c9a43ccaa97a84aa77b4c SHA256 4cfe78f97c5deb0d5a48123917d1b47c34ef63d609125b68e86b98dd5bb8d4d7
 MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3AHrAACgkQHB6c3gNBRYfbrACdGLd7kyyERpZZSYQfITl85RkO
+gy0AoJ+0PW1dUPGrj9F4jJSueN0OA6jy
+=usJU
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.5.8-r1.ebuild b/net-fs/samba/samba-3.5.8-r1.ebuild
index b63f77b0583e..27bf013ed6fb 100644
--- a/net-fs/samba/samba-3.5.8-r1.ebuild
+++ b/net-fs/samba/samba-3.5.8-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild,v 1.1 2011/03/23 11:04:30 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild,v 1.2 2011/05/03 15:26:29 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit pam confutils versionator multilib eutils
+inherit pam versionator multilib eutils
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -65,6 +65,11 @@ S="${WORKDIR}/${MY_P}/source3"
 
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
+REQUIRED_USE="
+	ads? ( ldap )
+	swat? ( server )
+"
+
 pkg_setup() {
 	if use server ; then
 		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
@@ -104,9 +109,6 @@ pkg_setup() {
 		eerror "Please use at least the latest stable gcc version."
 		die "Using sys-devel/gcc < 4.3 with winbind use flag."
 	fi
-
-	confutils_use_depend_all ads ldap
-	confutils_use_depend_all swat server
 }
 
 src_prepare() {
@@ -125,16 +127,16 @@ src_configure() {
 	local myconf
 
 	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
+	[[ ${CHOST} == *-*bsd* ]] && 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
 
 	# use_with doesn't accept 2 USE-flags
 	if use client && use ads ; then
-		myconf="${myconf} --with-cifsupcall"
+		myconf+=" --with-cifsupcall"
 	else
-		myconf="${myconf} --without-cifsupcall"
+		myconf+=" --without-cifsupcall"
 	fi
 
 	# Notes:
@@ -201,54 +203,54 @@ src_compile() {
 	# compile libs
 	if use addns ; then
 		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
+		emake libaddns
 	fi
 	if use netapi ; then
 		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
+		emake libnetapi
 	fi
 	if use smbclient ; then
 		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
+		emake libsmbclient
 	fi
 	if use smbsharemodes ; then
 		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
+		emake libsmbsharemodes
 	fi
 
 	# compile modules
-	emake modules || die "building modules failed"
+	emake modules
 
 	# compile pam moudles
 	if use pam ; then
 		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
+		emake pam_modules
 	fi
 
 	# compile winbind nss modules
 	if use winbind ; then
 		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
+		emake nss_modules
 	fi
 
 	# compile utilities
 	if [ -n "${BINPROGS}" ] ; then
 		einfo "make binprogs"
-		emake ${BINPROGS} || die "emake binprogs failed";
+		emake ${BINPROGS}
 	fi
 	if [ -n "${SBINPROGS}" ] ; then
 		einfo "make sbinprogs"
-		emake ${SBINPROGS} || die "emake sbinprogs failed";
+		emake ${SBINPROGS}
 	fi
 
 	if [ -n "${KRBPLUGIN}" ] ; then
 		einfo "make krbplugin"
-		emake ${KRBPLUGIN}${PLUGINEXT} || die "emake krbplugin failed";
+		emake ${KRBPLUGIN}${PLUGINEXT}
 	fi
 
 	if use client ; then
 		einfo "make {,u}mount.cifs"
-		emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
+		emake bin/{,u}mount.cifs
 	fi
 }
 
@@ -256,27 +258,27 @@ src_install() {
 	# install libs
 	if use addns ; then
 		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
+		emake installlibaddns DESTDIR="${D}"
 	fi
 	if use netapi ; then
 		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
+		emake installlibnetapi DESTDIR="${D}"
 	fi
 	if use smbclient ; then
 		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
+		emake installlibsmbclient DESTDIR="${D}"
 	fi
 	if use smbsharemodes ; then
 		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
+		emake installlibsmbsharemodes DESTDIR="${D}"
 	fi
 
 	# install modules
-	emake installmodules DESTDIR="${D}" || die "installing modules failed"
+	emake installmodules DESTDIR="${D}"
 
 	if use pam ; then
 		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
+		emake installpammodules DESTDIR="${D}"
 
 		if use winbind ; then
 			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
@@ -290,7 +292,7 @@ src_install() {
 	# Nsswitch extensions. Make link for wins and winbind resolvers
 	if use winbind ; then
 		einfo "install libwbclient"
-		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
+		emake installlibwbclient DESTDIR="${D}"
 		dolib.so ../nsswitch/libnss_wins.so
 		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
 		dolib.so ../nsswitch/libnss_winbind.so
@@ -310,29 +312,27 @@ src_install() {
 	# install binaries
 	insinto /usr
 	for prog in ${SBINPROGS} ; do
-		dosbin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+		dosbin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
 	done
 
 	for prog in ${BINPROGS} ; do
-		dobin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+		dobin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
 	done
 
 	# install krbplugin
 	if [ -n "${KRBPLUGIN}" ] ; then
 		if has_version app-crypt/mit-krb5 ; then
 			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
-			${KRBPLUGIN}${PLUGINEXT} failed"
+			doins ${KRBPLUGIN}${PLUGINEXT}
 		elif has_version app-crypt/heimdal ; then
 			insinto /usr/$(get_libdir)/plugin/krb5
-			doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
-			${KRBPLUGIN}${PLUGINEXT} failed"
+			doins ${KRBPLUGIN}${PLUGINEXT}
 		fi
 		insinto /usr
 		for prog in ${KRBPLUGIN} ; do
-			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+			doman ../docs/manpages/${prog/bin\/}*
 		done
 	fi
 
@@ -366,8 +366,7 @@ src_install() {
 		if use swat ; then
 			insinto /etc/xinetd.d
 			newins "${CONFDIR}/swat.xinetd" swat
-			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
-				|| die "installing swat failed"
+			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}"
 		fi
 
 		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
@@ -376,8 +375,8 @@ src_install() {
 	# install client files ({u,}mount.cifs into /)
 	if use client ; then
 		into /
-		dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
-		doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
+		dosbin bin/{u,}mount.cifs
+		doman ../docs/manpages/{u,}mount.cifs.8
 	fi
 
 	# install the spooler to cups