Fixed pkg_config. Bug 135505.

Package-Manager: portage-2.1-r1

3 files changed, 32 insertions, 21 deletions

diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog
index c85ba93910c3..fd4448229ea6 100644
--- a/net-misc/scponly/ChangeLog
+++ b/net-misc/scponly/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/scponly
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.25 2006/05/20 05:37:27 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.26 2006/07/15 00:42:27 matsuu Exp $
+
+  15 Jul 2006; MATSUU Takuto <matsuu@gentoo.org> scponly-4.6-r1.ebuild:
+  Fixed pkg_config. Bug 135505.
 
 *scponly-4.6-r1 (20 May 2006)
 
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index cc839e84298a..3855784f1a79 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,30 +1,30 @@
-AUX scponly-4.3-getopt.patch 616 RMD160 18320020a662291ad3530a3c3bae1d9931e0f225 SHA1 95298edb73afafa0dcda07c170dd3d502c775707 SHA256 fbd37908b2d45d11e7556d750ebee7fddb624789e2276a72f386ac1d062af9b4 size 616
+AUX scponly-4.3-getopt.patch 616 RMD160 18320020a662291ad3530a3c3bae1d9931e0f225 SHA1 95298edb73afafa0dcda07c170dd3d502c775707 SHA256 fbd37908b2d45d11e7556d750ebee7fddb624789e2276a72f386ac1d062af9b4
 MD5 c6b771b0da5de88d90f4715e2fe69e85 files/scponly-4.3-getopt.patch 616
 RMD160 18320020a662291ad3530a3c3bae1d9931e0f225 files/scponly-4.3-getopt.patch 616
 SHA256 fbd37908b2d45d11e7556d750ebee7fddb624789e2276a72f386ac1d062af9b4 files/scponly-4.3-getopt.patch 616
-AUX scponly-4.6-helper.patch 1755 RMD160 be58a67119450b3515934aa04214465a3dbb6d8e SHA1 a1c4e658e77a687d4e724c90c054dc59b0e3a8d1 SHA256 3f834abb3693e7f423f4d5277dd697b7b9a2c4cfab6e1aace60edcb7ea381543 size 1755
+AUX scponly-4.6-helper.patch 1755 RMD160 be58a67119450b3515934aa04214465a3dbb6d8e SHA1 a1c4e658e77a687d4e724c90c054dc59b0e3a8d1 SHA256 3f834abb3693e7f423f4d5277dd697b7b9a2c4cfab6e1aace60edcb7ea381543
 MD5 a9a47d32abfe8737a35cfee497fb0c30 files/scponly-4.6-helper.patch 1755
 RMD160 be58a67119450b3515934aa04214465a3dbb6d8e files/scponly-4.6-helper.patch 1755
 SHA256 3f834abb3693e7f423f4d5277dd697b7b9a2c4cfab6e1aace60edcb7ea381543 files/scponly-4.6-helper.patch 1755
-DIST scponly-4.3.tgz 94889 RMD160 780baf0a2be4b3042d721953c109c06ff0d9d1a2 SHA256 e707315e4f90ccc3f882e6b21617dc4543bab77edbe40546fe230119609b6143 size 94889
-DIST scponly-4.6.tgz 96578 RMD160 c30d4b02314b53dce54d2f3f8e531c18792c7f60 SHA256 dfa5a334d66150289a391aea4dc00d1b039c644fd1c628bdeddaa7b0710e01a7 size 96578
-EBUILD scponly-4.3.ebuild 1144 RMD160 4f54225693d8f6e7f58edf934413371d65dc8475 SHA1 7e261efa20d631471c8f8ab4518161f29931c7ab SHA256 a604cb706def445e5c03600846140b5cf93f4ace67731be03dd04dad7d8c0688 size 1144
+DIST scponly-4.3.tgz 94889 RMD160 780baf0a2be4b3042d721953c109c06ff0d9d1a2 SHA1 1aa08715d49c76ca0e78685b027e977acdd563c8 SHA256 e707315e4f90ccc3f882e6b21617dc4543bab77edbe40546fe230119609b6143
+DIST scponly-4.6.tgz 96578 RMD160 c30d4b02314b53dce54d2f3f8e531c18792c7f60 SHA1 d967ba69262c7675b9a0255884cf86c601d0d619 SHA256 dfa5a334d66150289a391aea4dc00d1b039c644fd1c628bdeddaa7b0710e01a7
+EBUILD scponly-4.3.ebuild 1144 RMD160 4f54225693d8f6e7f58edf934413371d65dc8475 SHA1 7e261efa20d631471c8f8ab4518161f29931c7ab SHA256 a604cb706def445e5c03600846140b5cf93f4ace67731be03dd04dad7d8c0688
 MD5 a1d8f11af1bc69f35f41b8ab1f088c71 scponly-4.3.ebuild 1144
 RMD160 4f54225693d8f6e7f58edf934413371d65dc8475 scponly-4.3.ebuild 1144
 SHA256 a604cb706def445e5c03600846140b5cf93f4ace67731be03dd04dad7d8c0688 scponly-4.3.ebuild 1144
-EBUILD scponly-4.6-r1.ebuild 4188 RMD160 bcf9ed69977d97c26117534913b34f457efe5baa SHA1 043450d0cfec38d89ce1b08b5b2093da18989e11 SHA256 4a50bfd167516dbf74f61496e64afef162513d1f9f101073b0f54b6aa7c4e70e size 4188
-MD5 55f73d87815fe7df953690685f5c26dc scponly-4.6-r1.ebuild 4188
-RMD160 bcf9ed69977d97c26117534913b34f457efe5baa scponly-4.6-r1.ebuild 4188
-SHA256 4a50bfd167516dbf74f61496e64afef162513d1f9f101073b0f54b6aa7c4e70e scponly-4.6-r1.ebuild 4188
-EBUILD scponly-4.6.ebuild 4031 RMD160 b9745fc31aa7c8087b74aa7397184eb967b2baef SHA1 5551716dd30927fb6fc951296b0665429d43c2bf SHA256 878751fc3666b6a7decad04ae16e844185fff188978482efcad3e963213ad450 size 4031
+EBUILD scponly-4.6-r1.ebuild 4367 RMD160 726b134b0ea963a93577c5646cf2e59082584b71 SHA1 131fcb126e50b80e0e4b966412a0981ae7b70246 SHA256 ff7373d59e6ca68d59c512d50ab27d8aa91efa3b5eac19ebc723a8272fa5d367
+MD5 e97c18d54779dfd4941bfc51ed26d354 scponly-4.6-r1.ebuild 4367
+RMD160 726b134b0ea963a93577c5646cf2e59082584b71 scponly-4.6-r1.ebuild 4367
+SHA256 ff7373d59e6ca68d59c512d50ab27d8aa91efa3b5eac19ebc723a8272fa5d367 scponly-4.6-r1.ebuild 4367
+EBUILD scponly-4.6.ebuild 4031 RMD160 b9745fc31aa7c8087b74aa7397184eb967b2baef SHA1 5551716dd30927fb6fc951296b0665429d43c2bf SHA256 878751fc3666b6a7decad04ae16e844185fff188978482efcad3e963213ad450
 MD5 9bf0ff80af9710e903a70988abf2508f scponly-4.6.ebuild 4031
 RMD160 b9745fc31aa7c8087b74aa7397184eb967b2baef scponly-4.6.ebuild 4031
 SHA256 878751fc3666b6a7decad04ae16e844185fff188978482efcad3e963213ad450 scponly-4.6.ebuild 4031
-MISC ChangeLog 3773 RMD160 aae7d708fb1f3b5d83eec31eb55ea1e47855d061 SHA1 559cb562f401a01b6f1b61e01276c48e51231e2a SHA256 d165fb43a074b2ea8d45e976392bcb5a44dadc7e908d7e152395eb5ea13ae563 size 3773
-MD5 7c56a88e62553cd79d89cd7f7ba3f6e3 ChangeLog 3773
-RMD160 aae7d708fb1f3b5d83eec31eb55ea1e47855d061 ChangeLog 3773
-SHA256 d165fb43a074b2ea8d45e976392bcb5a44dadc7e908d7e152395eb5ea13ae563 ChangeLog 3773
-MISC metadata.xml 201 RMD160 d72cb3677f941247cced43c6670a8d64642d5263 SHA1 552087b28a02c98c8c2426f5cab77d1089527572 SHA256 90b7d63705a9ef11d62f6fe39fe9e780d9e249d32c6b7b564ff05b818aa1f7f7 size 201
+MISC ChangeLog 3878 RMD160 65a4ff78968db5b769fed9a47be50dd45ec167a9 SHA1 0fa7eba705788b9ca3f9412869726c035f88aa10 SHA256 a8f7a5b35c0c82734c072281ae8bdc9f25b113072d442590a9f560adcbc5f2c3
+MD5 966f87b49aef81f5cd7b1f7f89bce737 ChangeLog 3878
+RMD160 65a4ff78968db5b769fed9a47be50dd45ec167a9 ChangeLog 3878
+SHA256 a8f7a5b35c0c82734c072281ae8bdc9f25b113072d442590a9f560adcbc5f2c3 ChangeLog 3878
+MISC metadata.xml 201 RMD160 d72cb3677f941247cced43c6670a8d64642d5263 SHA1 552087b28a02c98c8c2426f5cab77d1089527572 SHA256 90b7d63705a9ef11d62f6fe39fe9e780d9e249d32c6b7b564ff05b818aa1f7f7
 MD5 e10a0da4fac2882942ffa8360ccdd921 metadata.xml 201
 RMD160 d72cb3677f941247cced43c6670a8d64642d5263 metadata.xml 201
 SHA256 90b7d63705a9ef11d62f6fe39fe9e780d9e249d32c6b7b564ff05b818aa1f7f7 metadata.xml 201
diff --git a/net-misc/scponly/scponly-4.6-r1.ebuild b/net-misc/scponly/scponly-4.6-r1.ebuild
index b29b82a1480d..722fda6e8c39 100644
--- a/net-misc/scponly/scponly-4.6-r1.ebuild
+++ b/net-misc/scponly/scponly-4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.6-r1.ebuild,v 1.1 2006/05/20 05:37:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.6-r1.ebuild,v 1.2 2006/07/15 00:42:27 matsuu Exp $
 
 inherit eutils
 
@@ -65,18 +65,18 @@ pkg_config() {
 	{ grep -v "^/usr/bin/scponly$" /etc/shells;
 	echo "/usr/bin/scponly"
 	} > ${T}/shells
-	mv -f ${T}/shells /etc/shells
+	cp ${T}/shells /etc/shells
 
 	{ grep -v "^/usr/sbin/scponlyc$" /etc/shells;
 	echo "/usr/sbin/scponlyc"
 	} > ${T}/shells
-	mv -f ${T}/shells /etc/shells
+	cp ${T}/shells /etc/shells
 
 	BINARIES="/usr/$(get_libdir)/misc/sftp-server /bin/ls /usr/bin/scp /bin/rm /bin/ln /bin/mv /bin/chmod /bin/chown /bin/chgrp /bin/mkdir /bin/rmdir /bin/pwd /bin/groups /usr/bin/ld /bin/echo /usr/bin/rsync"
 	if built_with_use ${PN} subversion; then
 	    BINARIES="$BINARIES /usr/bin/svn /usr/bin/svnserve"
 	fi
-	LIB_LIST=`/usr/bin/ldd $BINARIES 2> /dev/null | /bin/cut -f2 -d\> | /bin/cut -f1 -d\( | /bin/grep "^ " | /bin/sort -u`
+	LIB_LIST=`/usr/bin/ldd $BINARIES 2> /dev/null | /bin/cut -f2 -d\> | /bin/cut -f1 -d\( | /bin/grep "^[ 	]" | /bin/sort -u`
 	LDSO_LIST="/$(get_libdir)/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /$(get_libdir)/ld-linux.so.2 /usr/libexec/ld-elf.so.1"
 	for lib in $LDSO_LIST; do
 		if [ -f $lib ]; then
@@ -135,7 +135,15 @@ pkg_config() {
 	fi
 	/bin/chown $myuser:$myuser ${myhome}/incoming
 
-	grep "^${myuser}" /etc/passwd > ${myhome}/etc/passwd
+	if [ ! -e ${myhome}/etc/passwd ]; then
+		grep "^${myuser}" /etc/passwd > ${myhome}/etc/passwd
+	fi
+
+	# Bug 135505
+	if [ ! -e ${myhome}/dev/null ]; then
+		/bin/install -c -d ${myhome}/dev
+		/bin/mknod -m 777 ${myhome}/dev/null c 1 3
+	fi
 
 	einfo "if you experience a warning with winscp regarding groups, please install"
 	einfo "the provided hacked out fake groups program into your chroot, like so:"