diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2007-05-15 09:59:40 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2007-05-15 09:59:40 +0000 |
| commit | 80a79bc77a85377808d80d2252df5766f66f9d1c (patch) | |
| tree | 2d583e9a8dc4a82cd56bd5ec0a361d43d0799cc5 /app-editors | |
| parent | Added ~x86-fbsd keyword, #174884 (diff) | |
| download | gentoo-2-80a79bc77a85377808d80d2252df5766f66f9d1c.tar.gz gentoo-2-80a79bc77a85377808d80d2252df5766f66f9d1c.tar.bz2 gentoo-2-80a79bc77a85377808d80d2252df5766f66f9d1c.zip | |
Added ~x86-fbsd keyword, #174884
(Portage version: 2.1.2.7)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r12.ebuild | 42 | ||||
| -rw-r--r-- | app-editors/emacs/files/emacs-21.4-freebsd-terminfo.patch | 16 |
3 files changed, 45 insertions, 19 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index d23a19c39f11..f1d3ec3dc9af 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.147 2007/05/14 20:11:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.148 2007/05/15 09:59:40 uberlord Exp $ + + 15 May 2007; Roy Marples <uberlord@gentoo.org> + +files/emacs-21.4-freebsd-terminfo.patch, emacs-21.4-r12.ebuild: + Added ~x86-fbsd keyword, #174884 14 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r12.ebuild: Remove !arm inverse arch flag for Xaw3d and motif, according to jokey it is diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild index 05182b59b0b1..3dcb1323d6b4 100644 --- a/app-editors/emacs/emacs-21.4-r12.ebuild +++ b/app-editors/emacs/emacs-21.4-r12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.15 2007/05/14 20:11:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.16 2007/05/15 09:59:40 uberlord Exp $ WANT_AUTOCONF="2.1" @@ -13,26 +13,26 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz LICENSE="GPL-2 FDL-1.1" SLOT="21" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="X Xaw3d leim lesstif motif nls nosendmail" RDEPEND="sys-libs/ncurses - X? ( - x11-libs/libXext - x11-libs/libICE - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXpm - x11-misc/emacs-desktop - >=media-libs/giflib-4.1.0.1b - >=media-libs/jpeg-6b-r2 - >=media-libs/tiff-3.5.5-r3 - >=media-libs/libpng-1.2.1 - Xaw3d? ( x11-libs/Xaw3d ) - motif? ( - lesstif? ( x11-libs/lesstif ) - !lesstif? ( >=x11-libs/openmotif-2.1.30 ) - ) + X? ( x11-libs/libXext + x11-libs/libICE + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXpm + x11-misc/emacs-desktop + >=media-libs/giflib-4.1.0.1b + >=media-libs/jpeg-6b-r2 + >=media-libs/tiff-3.5.5-r3 + >=media-libs/libpng-1.2.1 + !arm? ( + Xaw3d? ( x11-libs/Xaw3d ) + motif? ( + lesstif? ( x11-libs/lesstif ) + !lesstif? ( >=x11-libs/openmotif-2.1.30 ) ) + ) ) !nosendmail? ( virtual/mta ) >=app-admin/eselect-emacs-0.7-r1" @@ -46,6 +46,11 @@ src_unpack() { unpack ${A} cd "${S}" + sed -i \ + -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ + -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ + "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" + epatch "${FILESDIR}/emacs-21.3-xorg.patch" epatch "${FILESDIR}/emacs-21.3-amd64.patch" epatch "${FILESDIR}/emacs-21.3-hppa.patch" @@ -61,6 +66,7 @@ src_unpack() { epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch" epatch "${FILESDIR}/emacs-21.4-qa.patch" epatch "${FILESDIR}/emacs-21.4-Xaw3d-headers.patch" + epatch "${FILESDIR}/emacs-21.4-freebsd-terminfo.patch" # install emacsclient.1 man page (#165466) sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die diff --git a/app-editors/emacs/files/emacs-21.4-freebsd-terminfo.patch b/app-editors/emacs/files/emacs-21.4-freebsd-terminfo.patch new file mode 100644 index 000000000000..0741dbebfa1b --- /dev/null +++ b/app-editors/emacs/files/emacs-21.4-freebsd-terminfo.patch @@ -0,0 +1,16 @@ +Taken from FreeBSD Ports + +--- src/s/freebsd.h.orig Tue Feb 20 19:52:17 2001 ++++ src/s/freebsd.h Mon Feb 18 11:51:50 2002 +@@ -68,6 +68,11 @@ + #define LIBS_SYSTEM -lutil + #if __FreeBSD_version < 400000 + #define LIBS_TERMCAP -ltermcap ++#else ++#ifdef HAVE_LIBNCURSES ++#define TERMINFO ++#define LIBS_TERMCAP -lncurses ++#endif + #endif + + #define SYSV_SYSTEM_DIR |