gentoo resync : 13.06.2020

3 files changed, 28 insertions, 11 deletions

diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index aca62d1078bd..08bc20a534be 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,6 +1,7 @@
+AUX netatalk-3.1.12-fno-common.patch 259 BLAKE2B f7ab7ea73d027784a3b22d7587d9b7d2319a06c65a381e4e3a87f7b1d1f81c5f339f6d0f06e1cfde35946b6dc4cb6d8829dbc9d511bbed2a5ff30f24f6ab9fae SHA512 1a5875c1db68d7eba026471fa6d2f021d60e43c819ad420104f3b4b5843ca5bca1a83536262f7a97f0d2a2e8a875c2303e2d4c5750490320442af118b2498a01
 AUX netatalk-3.1.12-my_bool.patch 664 BLAKE2B f3eb18c0f73eea3b2caba305e052ce1705f40c1542ae14f0e3160e353b1da6b7c94be03285277b58888f01ed309ef62e7ee9736b5d7bd717d33123feb0aee107 SHA512 c09298f83b6e9d650c08dac410478122f203c38d7e10918b52456da828c34643ba0e2dba359d872d76d167217ce9dcf5a697761743452e482b87da5c7b3b1c0b
 AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2c9ed88566f0c3831d0a1e25e1c0aff8bbb5e09a36fd2b59b2ed7dc3fd0c9a3a68f80d65717f59538071cf1395c98e SHA512 5b8ff4ba306e1467d089df9c3f9dcfb22c4c21cce2c6b53e29dc84006efda0b88609cd00a01a2eec8f153d85d3c7283a1b5123219ecce1fe120a143290f3958f
 AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
 DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
-EBUILD netatalk-3.1.12.ebuild 4889 BLAKE2B 5ae3fef080a291e1161d3e8e404d5925ca3f4eea5ddaa524582ea1e01765f75da3ee3193496bc38051e6bf3ebd8ed3b6743dcaa8c360c38e50bc6538a45e8207 SHA512 3afcf785df73515347c07a94a966e9feb51c3e3ddd68e2a4cadfb88f675c613076e3cd983558ee005850b175fe53ffa1dd06df678c0b4fd98cd96f48f99e3508
+EBUILD netatalk-3.1.12.ebuild 4995 BLAKE2B 81942411af4a7bc541ff5f9dcf42a7975c25d24b4a64da60c7f097d8d74992d13ea8f08b1f17acbafc84688ccd56dd66ba0b95e97da7cedfee3a55f2c183913f SHA512 e0f571f9d69ffe096bf087b25d1b8dd656141bb99eda782c0c2e5fb3b69ac7351fd9adf77c61920286969a65b87d549e5c9f8d078a20c2074e6b23f733cb1169
 MISC metadata.xml 771 BLAKE2B a78f49af27765d075dc38234d4f0dd5c10e560b9ba10e17d6e24ed379b445f4db7e3148ecba449139e316c977ec43b606b7a83bf3075c7c53c3a8e81359f6033 SHA512 28ee7eb659776c18de5da3cb593e17f504b9eee22f429e41ad4cc1f7fcb64c953f67b2aed63cf43c5f05991bc3b4a37b1e768342213a13b7e866588c47d4f460
diff --git a/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch b/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch
new file mode 100644
index 000000000000..52a8cf3dce9a
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.1.12-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/etc/afpd/directory.h
++++ b/etc/afpd/directory.h
+@@ -91,7 +91,7 @@
+ #define	AR_UWRITE	(1<<2)
+ #define	AR_UOWN		(1<<7)
+ 
+-q_t *invalid_dircache_entries;
++extern q_t *invalid_dircache_entries;
+ 
+ typedef int (*dir_loop)(struct dirent *, char *, void *);
+ 
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index 369ce4e2ac3b..c56257545e19 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
 LICENSE="GPL-2 BSD"
 SLOT="0/18.0"
 KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf"
+IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl tracker tcpd +utils zeroconf"
 
 CDEPEND="
 	!app-editors/yudit
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.7-gentoo.patch
 	"${FILESDIR}"/${PN}-3.1.8-disable-ld-library-path.patch #564350
 	"${FILESDIR}"/${PN}-3.1.12-my_bool.patch #692560
+	"${FILESDIR}"/${PN}-3.1.12-fno-common.patch #706852
 )
 
 src_prepare() {
@@ -101,6 +102,7 @@ src_configure() {
 		$(use_with tracker)
 		$(use_with tracker dbus-daemon "${EPREFIX}/usr/bin/dbus-daemon")
 		$(use_with tracker tracker-pkgconfig-version $(ver_cut 1 $(best_version app-misc/tracker | sed 's:app-misc/tracker-::g')).0)
+		--disable-static
 		--enable-overwrite
 		--disable-krb4-uam
 		--disable-afs
@@ -120,9 +122,9 @@ src_install() {
 	default
 
 	if use zeroconf; then
-		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
+		sed -i -e '/avahi-daemon/s:use:need:g' "${ED}"/etc/init.d/${PN} || die
 	else
-		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
+		sed -i -e '/avahi-daemon/d' "${ED}"/etc/init.d/${PN} || die
 	fi
 
 	# The pamd file isn't what we need, use pamd_mimic_system
@@ -137,6 +139,9 @@ src_install() {
 	systemd_newunit "${T}"/service.systemd ${PN}.service
 
 	use utils && python_foreach_impl python_doscript contrib/shell_utils/afpstats
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
@@ -153,29 +158,29 @@ pkg_postinst() {
 				fi
 			done
 
-			echo ""
+			elog
 			elog "Starting from version 3.0 only uses a single init script again"
 			elog "Please update your runlevels accordingly"
-			echo ""
+			elog
 			elog "Dependencies should be resolved automatically depending on settings"
 			elog "but please report issues with this on https://bugs.gentoo.org/ if"
 			elog "you find any."
-			echo ""
+			elog
 			elog "Following config files are obsolete now:"
 			elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
 			elog "in favour of"
 			elog "/etc/afp.conf"
-			echo ""
+			elog
 			elog "Please convert your existing configs before you restart your daemon"
-			echo ""
+			elog
 			elog "The new AppleDouble default backend is appledouble = ea"
 			elog "Existing entries will be updated on access, but can do an offline"
 			elog "conversion with"
 			elog "dbd -ruve /path/to/Volume"
-			echo ""
+			elog
 			elog "For general notes on the upgrade, please visit"
 			elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
-			echo ""
+			elog
 			break
 		fi
 	done