Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 19597 | Differences between
and this patch

Collapse All | Expand All

(-)util-linux-2.11z-r1.ebuild.orig (-18 / +10 lines)
Lines 24-41 Link Here
24
	!selinux? ( sys-apps/pam-login )
24
	!selinux? ( sys-apps/pam-login )
25
	selinux? ( sys-apps/shadow )"
25
	selinux? ( sys-apps/shadow )"
26
26
27
28
RDEPEND="${DEPEND} dev-lang/perl
27
RDEPEND="${DEPEND} dev-lang/perl
29
	nls? ( sys-devel/gettext )"
28
	nls? ( sys-devel/gettext )"
30
29
31
32
src_unpack() {
30
src_unpack() {
33
	unpack ${A}
31
	unpack ${A}
34
32
35
	cd ${S}
33
	cd ${S}
36
34
37
	if [ ! -z "`use crypt`" ]
35
	if [ ! -z "`use crypt`" ] ; then
38
	then
39
		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
36
		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
40
	fi
37
	fi
41
38
Lines 45-51 Link Here
45
	# Fix unreadable df output
42
	# Fix unreadable df output
46
	epatch ${FILESDIR}/no-symlink-resolve.patch
43
	epatch ${FILESDIR}/no-symlink-resolve.patch
47
44
48
	cp MCONFIG MCONFIG.orig
45
	cp MCONFIG MCONFIG.orig || die
49
46
50
	sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
47
	sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
51
		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
48
		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
Lines 54-82 Link Here
54
		-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
51
		-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
55
		-e "s:usr/man:usr/share/man:" \
52
		-e "s:usr/man:usr/share/man:" \
56
		-e "s:usr/info:usr/share/info:" \
53
		-e "s:usr/info:usr/share/info:" \
57
		MCONFIG.orig > MCONFIG
54
		MCONFIG.orig > MCONFIG || die
58
}
55
}
59
56
60
src_compile() {
57
src_compile() {
61
58
62
	./configure || die "config"
59
	./configure || die "config"
63
60
64
	if [ -z "`use nls`" ]
61
	if [ -z "`use nls`" ] ; then
65
	then
62
		cp defines.h defines.h.orig || die
66
		cp defines.h defines.h.orig	
63
		grep -v "ENABLE_NLS" defines.h.orig > defines.h || die
67
		grep -v "ENABLE_NLS" \
68
			defines.h.orig > defines.h
69
		cp defines.h defines.h.orig
64
		cp defines.h defines.h.orig
70
		grep -v "HAVE_libintl_h" \
65
		grep -v "HAVE_libintl_h" defines.h.orig > defines.h || die
71
			defines.h.orig > defines.h
72
66
73
		cp Makefile Makefile.orig
67
		cp Makefile Makefile.orig || die
74
		sed -e "s:SUBDIRS=po \\\:SUBDIRS= \\\:g" \
68
		sed -e "s:SUBDIRS=po \\\:SUBDIRS= \\\:g" Makefile.orig > Makefile || die
75
			Makefile.orig > Makefile
76
	fi
69
	fi
77
	
70
	
78
	emake LDFLAGS="" || die
71
	emake LDFLAGS="" || die
79
	cd sys-utils; makeinfo *.texi || die
72
	cd sys-utils && makeinfo *.texi || die
80
}
73
}
81
74
82
src_install() {
75
src_install() {
Lines 88-91 Link Here
88
	docinto examples
81
	docinto examples
89
	dodoc example.files/*
82
	dodoc example.files/*
90
}
83
}
91

Return to bug 19597