diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2014-07-05 00:25:41 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2014-07-05 00:25:41 +0000 |
| commit | bc3934947e4983003eb95ec5f9d7dc4115aa8752 (patch) | |
| tree | 24bd4a1c14f3ad8d820c2c11972812c1246cbc84 /x11-terms | |
| parent | Version bump. (diff) | |
| download | gentoo-2-bc3934947e4983003eb95ec5f9d7dc4115aa8752.tar.gz gentoo-2-bc3934947e4983003eb95ec5f9d7dc4115aa8752.tar.bz2 gentoo-2-bc3934947e4983003eb95ec5f9d7dc4115aa8752.zip | |
Add a patch to build with USE=-utempter. #513892
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/hanterm/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch | 14 | ||||
| -rw-r--r-- | x11-terms/hanterm/hanterm-3.1.6-r4.ebuild | 22 |
3 files changed, 32 insertions, 12 deletions
diff --git a/x11-terms/hanterm/ChangeLog b/x11-terms/hanterm/ChangeLog index 1c7d4b3365d4..c047c36459cd 100644 --- a/x11-terms/hanterm/ChangeLog +++ b/x11-terms/hanterm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-terms/hanterm -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/hanterm/ChangeLog,v 1.29 2012/12/19 14:25:19 naota Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/hanterm/ChangeLog,v 1.30 2014/07/05 00:25:41 naota Exp $ + + 05 Jul 2014; Naohiro Aota <naota@gentoo.org> +files/hanterm-3.1.6-utmp.patch, + hanterm-3.1.6-r4.ebuild: + Add a patch to build with USE=-utempter. #513892 19 Dec 2012; <naota@gentoo.org> hanterm-3.1.6-r2.ebuild, hanterm-3.1.6-r4.ebuild: diff --git a/x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch b/x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch new file mode 100644 index 000000000000..32659263b5d1 --- /dev/null +++ b/x11-terms/hanterm/files/hanterm-3.1.6-utmp.patch @@ -0,0 +1,14 @@ +diff --git a/main.c b/main.c +index ac15032..e465329 100644 +--- a/main.c ++++ b/main.c +@@ -1936,7 +1936,9 @@ spawn () + #endif /* LASTLOG */ + #endif /* UTMP */ + ++#ifdef UTMP + memset (&utmp, '\0', sizeof(utmp)); ++#endif + + screen->uid = getuid(); + screen->gid = getgid(); diff --git a/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild b/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild index c475c5fe3a72..8e8b5d855d79 100644 --- a/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild +++ b/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild,v 1.5 2012/12/19 14:25:19 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/hanterm/hanterm-3.1.6-r4.ebuild,v 1.6 2014/07/05 00:25:41 naota Exp $ +EAPI=5 inherit eutils toolchain-funcs DESCRIPTION="Hanterm -- Korean terminal" @@ -21,20 +22,21 @@ DEPEND="x11-libs/libXmu RDEPEND="${DEPEND} media-fonts/baekmuk-fonts" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-gentoo.patch" +src_prepare() { + epatch "${FILESDIR}/${P}-gentoo.patch" \ + "${FILESDIR}"/${P}-utmp.patch sed -i -e "/^LDFLAGS/s:=:& ${LDFLAGS} :" \ -e "s:\$(CFLAGS):& \$(LDFLAGS) :" Makefile.in } -src_compile() { +src_configure() { econf \ --with-Xaw3d \ - $(use_with utempter) \ - || die "econf failed" - emake CC="$(tc-getCC)" || die "emake failed" + $(use_with utempter) +} + +src_compile() { + emake CC="$(tc-getCC)" } src_install() { |