Rename file in the tree, specify name in metadata

Package-Manager: portage-2.1.4.1

6 files changed, 29 insertions, 12 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index c02d0c876a81..30d05ba64e9b 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.66 2008/02/01 09:07:18 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.67 2008/02/05 12:32:19 stefaan Exp $
+
+  05 Feb 2008; Stefaan De Roeck <stefaan@gentoo.org> +files/autofs5.rc1,
+  -files/autofs.rc14, metadata.xml, autofs-5.0.3.ebuild,
+  autofs-5.0.3-r1.ebuild:
+  Rename file in the tree, specify name in metadata
 
 *autofs-5.0.3-r1 (01 Feb 2008)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 7fd2183db3d1..874567030dc4 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -8,12 +8,12 @@ AUX autofs.rc10 6373 RMD160 bbff8d48111f33a36afd4bf1628d7366a87478fd SHA1 957f37
 AUX autofs.rc11 7469 RMD160 e8472a75e3804a83cdb31fb1a9e293a87492ba0b SHA1 be29dc822d5216bd40edf1067df04eb5b56455a1 SHA256 a050aff19d249598d789859fbfd01ac72d73a68f83d9edb96661aae76a5f5481
 AUX autofs.rc12 7807 RMD160 bdd91c47ee5c223ca6eb7b395a4f82f36abd26f6 SHA1 a5efe6948c9674c4d2019db5e81de9d0a64ffaca SHA256 dc08949c2d47614be7fcea8be9988de52715b8072753ee3df77a87c19962975c
 AUX autofs.rc13 7876 RMD160 feb761b16f10e90ca55fc25a75b1ada9e79a83e2 SHA1 dadfdea84cf741ede50f5131433f88b09dd05f40 SHA256 d477a63305db5d0cc78e9f538cea745f733ae46305f71986c8a5abce1d2f0c56
-AUX autofs.rc14 920 RMD160 efdc6c8d7bde975c2189f818184f27057f045352 SHA1 2595363868212f6d5e6d3c0516b7c20114f58f87 SHA256 e84d49f6e9f1252b7db2392f60d21171f9eb21355a1cba7a19fed6b2949b0d83
 AUX autofs.rc6 3717 RMD160 9124279f8c70b0f4f9c4729a71469b178bd2395a SHA1 b17efbf35768395ea25c9ea4037d49c3eb61d4a2 SHA256 96ecff3e66a4364aaea5bdce7a33454b3315a04745cc5897208c33e749692016
 AUX autofs.rc7 3624 RMD160 898c771eedbf52cbf856449370640873db7c4fd2 SHA1 f72e598317ba58fe6c9598547876e8dd60b9e007 SHA256 406a9025829c8485ef73400a76f678a6c1c87694241936db1dfae5241e751e5e
 AUX autofs.rc8 5186 RMD160 7a97786ecbca979a1b3aa754b6a638b580a9836d SHA1 f1f5b9837d176085c5e81bfe2321bdec15f90e74 SHA256 e9c094b03fec0a184800f750d79bf73ee6daf614c312b5c927110d8f2b0d1511
 AUX autofs.rc9 5617 RMD160 2822212b6717504aecc29cab029e5247bddecca9 SHA1 2b159ab25f390cdc230b20046ce8b4adcc8e99fb SHA256 6534a2c96f915132d7834478bf8913a8f00bf97ae91c5df55bf5e612f403735b
 AUX autofs1.confd 137 RMD160 35c5171eb57db792830e94f28058b1b50534c236 SHA1 d5e415b4bb74b1fd91f9ad4ce863cd70ca5460d1 SHA256 d4be4500623e3ba986ad124b273c9119da78b12eb94c6d39e358ed9d623a1a8a
+AUX autofs5.rc1 920 RMD160 9adb413578fba86eeabefb2c25b4bf6e27bd8efe SHA1 44db5523bc7d07c949e71bf0fda6499b0c6578d1 SHA256 94c956da80446f391df3a8f89794754c0e42ea9d1fca47f2abe57eecadbc3ffa
 AUX automount.diff 322 RMD160 7fdfa7bd519451b47cbb9795e2ae482ddd45ff59 SHA1 c6bf3d6b2433cafe122d821142f44eee1a8b6ad7 SHA256 eef2d99787fc8967f10c5c308e3a271532013225bdfe28578d0ecb5e3c0c16c1
 AUX ldap_config.patch 785 RMD160 47b296b3dcb005fd65a8b707dbc0ace319d3ace7 SHA1 b81701d25b583d0382b41059be11e2e9ef6a523b SHA256 5f0eb87ea8e20fc4fac46afde8d50fe9307a1835979c279855d36d323e8ff57d
 AUX nisyp.patch 419 RMD160 338ad78c60e048aad661b98c008b8f7cafd7ba8b SHA1 079f558edc12ed022b6f843026aedcf2c6f290c1 SHA256 e85a998ed1f40d41c32b15e1184fcd0b96a9d86f42cf10ebd76c3e553eea19f0
@@ -46,7 +46,7 @@ EBUILD autofs-4.1.3-r4.ebuild 2973 RMD160 146a44b68bd42a8309518c8fef23d2c40c3600
 EBUILD autofs-4.1.3-r7.ebuild 3003 RMD160 159090b532fc72917d101f0fea4c02409663ba97 SHA1 6c77e3143816d1234cb884a03cda22b92cd0d266 SHA256 22870b6945cbc8fe00d80986c9b6a96f0c14e79bbb41381009d791676f8f61fc
 EBUILD autofs-4.1.3-r8.ebuild 3116 RMD160 abd6391c3eaa8145db089e1d6b9ade45d0717fc7 SHA1 a43fcb2534f7424fc4c8fd291076a25a335234f3 SHA256 23bf695145bf8570d6296cb5788e6a6ac05721507bfd80ba54c987e521508bea
 EBUILD autofs-4.1.3.ebuild 1923 RMD160 eaab58530b774637b8b3ae8600a99e17eb31c0ca SHA1 cace6b8fae4c228c99b278a84e0889ce51c23a13 SHA256 655ab0f95d4d71fb37788ef6bd35c1cca0abd8b2714d67cbb26837c8477d95f7
-EBUILD autofs-5.0.3-r1.ebuild 1781 RMD160 70a741d2e78ca4eec7cc386d8f2863984ea593fe SHA1 e40e5d61018e37d72616e2f5f0941c2cd9846c23 SHA256 76352e99c916e8b69ba55ef07979c9a63da6f3ef27b0f667372c614fd699c393
-EBUILD autofs-5.0.3.ebuild 1635 RMD160 f5ee8d00b7896faf35572d2ce7179c05d6abf31f SHA1 946f9e444cfb2c46d6bbe95bd6e183e09f41bbc3 SHA256 0dd4854ffd609605d308c020606538d7ae1bc93027a84672303a244d73c3d7ac
-MISC ChangeLog 9713 RMD160 8d24c6ff0b60da0037a5681ae7605bd27f2f67eb SHA1 ec80ebf284cdf6e7463b4a2e43d582a629dc3721 SHA256 2d01af7be3f836c23cf54123bee0ed1362f6ba7a32c070fdd81f7eed0e79749c
-MISC metadata.xml 222 RMD160 57df42872d89d82dec993ad7a3c3bccf9c657b84 SHA1 d5fd7e4ef6f7cfdc6dca75e16d8f93919120c23e SHA256 d17745287b9215a63e78c7cf1380de4637ef9001339d82e645d2cef00297b428
+EBUILD autofs-5.0.3-r1.ebuild 2252 RMD160 769805c5ff06c8acc6dde7e60d9c365058271a82 SHA1 da7f063ee957643b8e0d91a7432d64160c6cbddd SHA256 727d68be090f5eb1646798e45b897f0e951ea2699118838e7d4140a24d00821e
+EBUILD autofs-5.0.3.ebuild 1635 RMD160 3b0d5e7c5100f60e7d6da903000142e676dce338 SHA1 e4d85cdbbbc89daec1e536fda5f9b6faf4ddf95f SHA256 a5839d8964101cec67d5ec3e70870122acab999906db3d65c40a0ea9ab77604c
+MISC ChangeLog 9922 RMD160 a0095608de41d8cb5c6b60188b3a8e443f5bb619 SHA1 a1dc6f04a7ed3a099971ee7d6691fa75ab692e95 SHA256 e22de49f8e4f7b2e405784c0fccd9c4489d8c8990cf302c50f29c7e8baa4fb88
+MISC metadata.xml 258 RMD160 3e5f58364805d3e42d35bb18afabc84771edc6e3 SHA1 f889879c2dfdef80624ebebd791c1b944ff859ae SHA256 3a3251d51801f0288687f235aed354e0f68cb6f90775941ba03b83bfd71e5dae
diff --git a/net-fs/autofs/autofs-5.0.3-r1.ebuild b/net-fs/autofs/autofs-5.0.3-r1.ebuild
index 333775746f81..43ad9fa3ac31 100644
--- a/net-fs/autofs/autofs-5.0.3-r1.ebuild
+++ b/net-fs/autofs/autofs-5.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r1.ebuild,v 1.1 2008/02/01 09:07:18 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r1.ebuild,v 1.2 2008/02/05 12:32:19 stefaan Exp $
 
 inherit eutils multilib autotools
 
@@ -31,9 +31,20 @@ src_unpack() {
 
 	cd "${S}"
 	eautoconf || die "Autoconf failed"
+
+	# # use CC and CFLAGS from environment (bug #154797)
+	# write these values in Makefile.conf
+#	(echo "CC := @CC@"; echo "CFLAGS := @CFLAGS@") >> Makefile.conf.in
+	# make sure Makefile.conf is parsed after Makefile.rules
+#	sed -ni '/include Makefile.conf/{x; n; G}; p' Makefile
+
+	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
+	# as the former is a lame header for the latter (bug #157968)
+	sed -i 's@nfs/nfs.h@linux/nfs.h@' include/rpc_subs.h
 }
 
 src_compile() {
+	CFLAGS="${CFLAGS}" \
 	econf \
 		$(use_with ldap openldap) \
 		$(use_with sasl) \
@@ -46,7 +57,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd "${FILESDIR}"/autofs.rc14 autofs
+	newinitd "${FILESDIR}"/autofs5.rc1 autofs
 }
 
 pkg_postinst() {
diff --git a/net-fs/autofs/autofs-5.0.3.ebuild b/net-fs/autofs/autofs-5.0.3.ebuild
index 6814a7c9f4d4..4e5cc4532755 100644
--- a/net-fs/autofs/autofs-5.0.3.ebuild
+++ b/net-fs/autofs/autofs-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3.ebuild,v 1.1 2008/01/31 23:19:24 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3.ebuild,v 1.2 2008/02/05 12:32:19 stefaan Exp $
 
 inherit eutils multilib autotools
 
@@ -39,7 +39,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd "${FILESDIR}"/autofs.rc14 autofs
+	newinitd "${FILESDIR}"/autofs5.rc1 autofs
 }
 
 pkg_postinst() {
diff --git a/net-fs/autofs/files/autofs.rc14 b/net-fs/autofs/files/autofs5.rc1
index 948e9242f761..9e4252adf3ea 100644
--- a/net-fs/autofs/files/autofs.rc14
+++ b/net-fs/autofs/files/autofs5.rc1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc14,v 1.1 2008/01/31 23:19:25 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.rc1,v 1.1 2008/02/05 12:32:20 stefaan Exp $
 
 DAEMON=/usr/sbin/automount
 PIDFILE=/var/run/autofs.pid
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index 9e24abe6169e..b3cc0332d3b8 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>net-fs</herd>
 <maintainer>
-  <email>stefaan@gentoo.org</email>
+    <email>stefaan@gentoo.org</email>
+    <name>Stefaan De Roeck</name>
 </maintainer>
 </pkgmetadata>