Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 101218
Collapse All | Expand All

(-)coreutils-5.2.1-r6.ebuild (-17 / +30 lines)
Lines 88-98 Link Here
88
	automake || die "automake"
88
	automake || die "automake"
89
	eend $?
89
	eend $?
90
90
91
	if [[ ${USERLAND} != "GNU" ]]; then
92
		myconf="${myconf} --program-prefix=g"
93
	else
94
		myconf="${myconf} --bindir=/bin"
95
	fi
96
91
	econf \
97
	econf \
92
		--bindir=/bin \
93
		--enable-largefile \
98
		--enable-largefile \
94
		$(use_enable nls) \
99
		$(use_enable nls) \
95
		$(use_enable selinux) \
100
		$(use_enable selinux) \
101
		${myconf} \
96
		|| die "econf"
102
		|| die "econf"
97
103
98
	use static && append-ldflags -static
104
	use static && append-ldflags -static
Lines 116-132 Link Here
116
	insinto /etc
122
	insinto /etc
117
	doins ${FILESDIR}/DIR_COLORS
123
	doins ${FILESDIR}/DIR_COLORS
118
124
119
	# move non-critical packages into /usr
125
	# not needed for non-GNU userland as it installs everything on /usr/bin
120
	cd "${D}"
126
	if [[ ${USERLAND} == "GNU" ]]; then
121
	dodir /usr/bin
127
		# move non-critical packages into /usr
122
	mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
128
		cd "${D}"
123
	mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
129
		dodir /usr/bin
124
	mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
130
		mv bin/{csplit,expand,factor,fmt,fold,join,md5sum,nl,od} usr/bin
125
	cd bin
131
		mv bin/{paste,pathchk,pinky,pr,printf,sha1sum,shred,sum,tac} usr/bin
126
	local x
132
		mv bin/{tail,test,[,tsort,unexpand,users} usr/bin
127
	for x in * ; do
133
		cd bin
128
		dosym /bin/${x} /usr/bin/${x}
134
		local x
129
	done
135
		for x in * ; do
136
			dosym /bin/${x} /usr/bin/${x}
137
		done
138
	fi
130
139
131
	if ! use build ; then
140
	if ! use build ; then
132
		cd ${S}
141
		cd ${S}
Lines 134-146 Link Here
134
	else
143
	else
135
		rm -r "${D}"/usr/share
144
		rm -r "${D}"/usr/share
136
	fi
145
	fi
146
147
	rm -f ${D}/usr/lib/charset.alias
137
}
148
}
138
149
139
pkg_postinst() {
150
pkg_postinst() {
140
	# hostname does not get removed as it is included with older stage1
151
	if [[ ${USERLAND} == "GNU" ]]; then
141
	# tarballs, and net-tools installs to /bin
152
		# hostname does not get removed as it is included with older stage1
142
	if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
153
		# tarballs, and net-tools installs to /bin
143
	then
154
		if [ -e ${ROOT}/usr/bin/hostname ] && [ ! -L ${ROOT}/usr/bin/hostname ]
144
		rm -f ${ROOT}/usr/bin/hostname
155
		then
156
			rm -f ${ROOT}/usr/bin/hostname
157
		fi
145
	fi
158
	fi
146
}
159
}

Return to bug 101218