From 7bbe6a15ea9e8d897a5895ab63bd0f4f68747be9 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Thu, 2 Sep 2010 14:44:07 +0000 Subject: Respect LDFLAGS, fixes bug 335516 by flameeyes. Port to EAPI 3 and remove some die comments Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- app-editors/uemacs-pk/ChangeLog | 9 +++++++-- app-editors/uemacs-pk/Manifest | 12 ++++++------ app-editors/uemacs-pk/uemacs-pk-4.0.18.ebuild | 16 +++++++++------- 3 files changed, 22 insertions(+), 15 deletions(-) (limited to 'app-editors') diff --git a/app-editors/uemacs-pk/ChangeLog b/app-editors/uemacs-pk/ChangeLog index 66c73ae02766..25fca4225790 100644 --- a/app-editors/uemacs-pk/ChangeLog +++ b/app-editors/uemacs-pk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/uemacs-pk -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/ChangeLog,v 1.5 2008/01/27 10:29:53 opfer Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/ChangeLog,v 1.6 2010/09/02 14:44:07 fauli Exp $ + + 02 Sep 2010; Christian Faulhammer + uemacs-pk-4.0.18.ebuild: + Respect LDFLAGS, fixes bug 335516 by flameeyes. Port to EAPI 3 and remove + some die comments 27 Jan 2008; Christian Faulhammer uemacs-pk-4.0.18.ebuild: diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest index ff4e20579f92..e8526ebd0800 100644 --- a/app-editors/uemacs-pk/Manifest +++ b/app-editors/uemacs-pk/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 AUX uemacs-pk-4.0.18-gentoo.patch 3207 RMD160 f9485775ed878daaed98bb2244464d7b27b6d3db SHA1 db0e9d01ec5750b263fb308c698bb69f8c7f81ed SHA256 41396a16f7af27be6d3671462b930ffdac998c0bdc500650b8d8716a3c2324ab DIST em-4.0.18.tar.gz 209742 RMD160 cab55709910c06c31d64cd12ce4ffb0142e2a514 SHA1 510dc15568af30c5b5cb7545c7b4ff62fba2032f SHA256 b3c014a30c54e04cfa53c477136541e1edffbb8a28016904a79948b3b718bfc5 -EBUILD uemacs-pk-4.0.18.ebuild 930 RMD160 fee11bf19534a926c43fb76981c4dbdca8b40179 SHA1 e2daf6bf2fe9e66f9dff0b0a74495a7a0798b047 SHA256 54267a29de9c1b00fc426c8a80e3709e2400478ebe3f6bcdc423b487d4955735 -MISC ChangeLog 860 RMD160 3c128ab75b0eaefb489b677673fa68b4b8353a4b SHA1 1f26ce37a2cd5683739277918218167f2c3e8640 SHA256 371f10ed28428da1e79303ae67e022973ed594310a54bb0d73ab81009c7fa70b +EBUILD uemacs-pk-4.0.18.ebuild 1061 RMD160 4ce86aba158adf360fae6570d28fcd6cdee3b3c9 SHA1 d7c2a97ad6aaa3ddff78ed8f58a84a934082df82 SHA256 19d226968dbe0e402959412b301631ab33cdbeaf15deb1813ed4ab2f22a5f815 +MISC ChangeLog 1039 RMD160 cb36dcb3c4450e55144bed7817023ea6a976ed33 SHA1 3b2155036e92d7661fc57fb10ee3f114c2fd1ef1 SHA256 a5fcbdb9432f2bbd8862ebbcf3538b36cf82d0c67d63d74e3eca7092a005a9f0 MISC metadata.xml 945 RMD160 491b0ce5fb5698bd1d1cb4bd0d99965bd867277b SHA1 470ef66b4ed2fec31229e7f66d1ad8706a781482 SHA256 20f67b1215ecb8d611237bcad8b1091fc0c62580bdab27ce6185469851365c80 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.8 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkfgxW4ACgkQOeoy/oIi7uwQQACggFi967h3Hi44YqGjsbfbZIMG -s/gAoKCbHHFIfMFH7GewTaA1A71RlZMj -=8xYB +iEYEARECAAYFAkx/uEkACgkQNQqtfCuFneMWaACfX5v1fgpd+ySj7GEhWgGiXWHy +YmoAnj0exCmB+v3vg8/6DNboYujSJupL +=092w -----END PGP SIGNATURE----- diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.18.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.18.ebuild index 40048e1a3f98..04c457b6ff23 100644 --- a/app-editors/uemacs-pk/uemacs-pk-4.0.18.ebuild +++ b/app-editors/uemacs-pk/uemacs-pk-4.0.18.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.18.ebuild,v 1.5 2008/01/27 10:29:53 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.18.ebuild,v 1.6 2010/09/02 14:44:07 fauli Exp $ + +EAPI=3 inherit eutils toolchain-funcs @@ -18,14 +20,14 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/em-${PV}" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${P}-gentoo.patch + # Respect LDFLAGS when linking, bug 335516 + sed -e 's:${CC} ${DEFINES} -o emacs ${OBJ} ${LIBS}:${CC} ${DEFINES} ${LDFLAGS} -o emacs ${OBJ} ${LIBS}:' -i "${S}"/makefile || die } src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die } src_install() { @@ -33,5 +35,5 @@ src_install() { insinto /usr/share/${PN} doins emacs.hlp newins emacs.rc .emacsrc - dodoc readme readme.39e emacs.ps || die "dodoc failed" + dodoc readme readme.39e emacs.ps || die } -- cgit v1.2.3-65-gdbad