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 (-25 / +15 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /home/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r1.ebuild,v 1.7 2003/03/24 03:11:55 method Exp $
3
# $Header: /home/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.11z-r1.ebuild,v 1.7 2003/03/24 03:11:55 method Exp $
4
4
5
IUSE="crypt nls selinux"
5
IUSE="crypt nls selinux static"
6
6
7
inherit eutils flag-o-matic
7
inherit eutils flag-o-matic
8
8
Lines 20-41 Link Here
20
LICENSE="GPL-2"
20
LICENSE="GPL-2"
21
21
22
DEPEND="virtual/glibc
22
DEPEND="virtual/glibc
23
	>=sed-4.0.5
23
	>=sys-libs/ncurses-5.2-r2
24
	>=sys-libs/ncurses-5.2-r2
24
	!selinux? ( sys-apps/pam-login )
25
	!selinux? ( sys-apps/pam-login )
25
	selinux? ( sys-apps/shadow )"
26
	selinux? ( sys-apps/shadow )"
26
27
27
28
RDEPEND="${DEPEND} dev-lang/perl
28
RDEPEND="${DEPEND} dev-lang/perl
29
	nls? ( sys-devel/gettext )"
29
	nls? ( sys-devel/gettext )"
30
30
31
32
src_unpack() {
31
src_unpack() {
33
	unpack ${A}
32
	unpack ${A}
34
33
35
	cd ${S}
34
	cd ${S}
36
35
37
	if [ ! -z "`use crypt`" ]
36
	if [ ! -z "`use crypt`" ] ; then
38
	then
39
		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
37
		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
40
	fi
38
	fi
41
39
Lines 45-82 Link Here
45
	# Fix unreadable df output
43
	# Fix unreadable df output
46
	epatch ${FILESDIR}/no-symlink-resolve.patch
44
	epatch ${FILESDIR}/no-symlink-resolve.patch
47
45
48
	cp MCONFIG MCONFIG.orig
46
	sed -i \
49
47
		-e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
50
	sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
51
		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
48
		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
52
		-e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
49
		-e "s:HAVE_PAM=no:HAVE_PAM=yes:" \
53
		-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
50
		-e "s:HAVE_SLN=no:HAVE_SLN=yes:" \
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 || die "MCONFIG sed"
55
56
	if [ -z "`use nls`" ] ; then
57
		sed -i -e 's/DISABLE_NLS=no/DISABLE_NLS=yes/' MCONFIG ||
58
			die "MCONFIG nls sed"
59
	fi
58
}
60
}
59
61
60
src_compile() {
62
src_compile() {
61
63
62
	./configure || die "config"
64
	./configure || die "config"
63
65
64
	if [ -z "`use nls`" ]
66
	if [ "`use static`" ] ; then
65
	then
67
		export LDFLAGS=-static
66
		cp defines.h defines.h.orig	
67
		grep -v "ENABLE_NLS" \
68
			defines.h.orig > defines.h
69
		cp defines.h defines.h.orig
70
		grep -v "HAVE_libintl_h" \
71
			defines.h.orig > defines.h
72
73
		cp Makefile Makefile.orig
74
		sed -e "s:SUBDIRS=po \\\:SUBDIRS= \\\:g" \
75
			Makefile.orig > Makefile
76
	fi
68
	fi
77
	
69
	emake || die "emake"
78
	emake LDFLAGS="" || die
70
	cd sys-utils && makeinfo *.texi || die "makeinfo"
79
	cd sys-utils; makeinfo *.texi || die
80
}
71
}
81
72
82
src_install() {
73
src_install() {
Lines 88-91 Link Here
88
	docinto examples
79
	docinto examples
89
	dodoc example.files/*
80
	dodoc example.files/*
90
}
81
}
91

Return to bug 19597