diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-11-14 14:20:22 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-11-14 14:20:22 +0000 |
| commit | 59cd9827dec12451ff110a26df8d1a0203a0f369 (patch) | |
| tree | a2bee99fcae784d314e56d044b3b9d1b7325081c | |
| parent | Copy from Portage tree. (diff) | |
| download | emacs-59cd9827dec12451ff110a26df8d1a0203a0f369.tar.gz emacs-59cd9827dec12451ff110a26df8d1a0203a0f369.tar.bz2 emacs-59cd9827dec12451ff110a26df8d1a0203a0f369.zip | |
Convert to EAPI=2 for USE dependencies.
svn path=/emacs-overlay/; revision=1209
| -rw-r--r-- | app-editors/emacs/ChangeLog | 2 | ||||
| -rw-r--r-- | app-editors/emacs/Manifest | 4 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-18.59-r5.ebuild | 22 |
3 files changed, 12 insertions, 16 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index d7c0115..bb8a7d3 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -6,5 +6,5 @@ 14 Nov 2008; Ulrich Mueller <ulm@gentoo.org> +metadata.xml, +emacs-18.59-r5.ebuild: - Copy from Portage tree. + Copy from Portage tree. Convert to EAPI=2 for USE dependencies. diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index d59a48a..b4f51f1 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,6 +1,6 @@ DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd DIST emacs-18.59-patches-3.tar.bz2 17323 RMD160 c0a205792f80c34b599c82fe5cf957f10f80956a SHA1 d452c45756e69edf71a46518cfde809eb65955f9 SHA256 679fe1c0e4fbc2ccf44e6c7097aa093c4e575fde15b5416d944916893bd543ff DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e -EBUILD emacs-18.59-r5.ebuild 2628 RMD160 98230ad513331ac2e9657ef374425dde606929b8 SHA1 b9e08234616ded59e5ba122b79a06eef025fbd82 SHA256 66dcdebc1787801ab7a66dd699a8c244b239e5f4d2421dfe0f59155179984448 -MISC ChangeLog 264 RMD160 a7a84b4009ed80288238b14c92ad333f7f6459f1 SHA1 bc83be5f7ed00e82203bead17a445cbe0f5e1c19 SHA256 d55100e7827492a4beb89c36fa5c858e197b5bb74c104be457d266a1394f8856 +EBUILD emacs-18.59-r5.ebuild 2513 RMD160 4d07042bb4e54ba3798cfe770c985d79a3bd14cb SHA1 99b617e5a4d35491584e57c753b068a16879aa9b SHA256 b232307324352ea9bc3151f705372a61700232f39b858925c3b2349ae5134e38 +MISC ChangeLog 304 RMD160 0404ed94515aeac91541bfc0161bb4d6dffcfea0 SHA1 10c807d6b13b60608d6a9720899fe02360e5e0cc SHA256 2c4f75048cd03bec6da902586959c89bba8c733b3bc5830367ea2aa7c9654f9b MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5 diff --git a/app-editors/emacs/emacs-18.59-r5.ebuild b/app-editors/emacs/emacs-18.59-r5.ebuild index 87f674a..99ad3ad 100644 --- a/app-editors/emacs/emacs-18.59-r5.ebuild +++ b/app-editors/emacs/emacs-18.59-r5.ebuild @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.6 2008/11/14 09:11:43 ulm Exp $ +EAPI=2 + inherit eutils toolchain-funcs flag-o-matic DESCRIPTION="The extensible self-documenting text editor" @@ -17,28 +19,18 @@ IUSE="X" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 - X? ( x11-libs/libX11 )" + X? ( x11-libs/libX11[-xcb] )" DEPEND="${RDEPEND}" MY_BASEDIR="/usr/share/emacs/${PV}" MY_LOCKDIR="/var/lib/emacs/lock" -pkg_setup() { - use X && built_with_use x11-libs/libX11 xcb \ - && die "${P} requires x11-libs/libX11 built with USE=-xcb" -} - -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff" EPATCH_SUFFIX=patch epatch } -src_compile() { - # Do not use the sandbox, or the dumped Emacs will be twice as large - SANDBOX_ON=0 - +src_configure() { # autoconf? What's autoconf? We are living in 1992. ;-) local arch case ${ARCH} in @@ -60,7 +52,11 @@ src_compile() { filter-flags -finline-functions replace-flags -O[3-9] -O2 strip-flags +} +src_compile() { + # Do not use the sandbox, or the dumped Emacs will be twice as large + SANDBOX_ON=0 emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die } |