public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2012-01-04 17:30 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 8+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2012-01-04 17:30 UTC (permalink / raw
  To: gentoo-commits

phajdan.jr    12/01/04 17:30:27

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  x86 stable wrt bug #396139
  
  (Portage version: 2.1.10.41/cvs/Linux i686)

Revision  Changes    Path
1.453                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.453&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.453&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.452&r2=1.453

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- ChangeLog	28 Dec 2011 17:35:19 -0000	1.452
+++ ChangeLog	4 Jan 2012 17:30:27 -0000	1.453
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.452 2011/12/28 17:35:19 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.453 2012/01/04 17:30:27 phajdan.jr Exp $
+
+  04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> emacs-18.59-r8.ebuild:
+  x86 stable wrt bug #396139
 
   28 Dec 2011; Agostino Sarubbo <ago@gentoo.org> emacs-18.59-r8.ebuild:
   Stable for AMD64, wrt bug #396139



1.4                  app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.3&r2=1.4

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-18.59-r8.ebuild	28 Dec 2011 17:35:19 -0000	1.3
+++ emacs-18.59-r8.ebuild	4 Jan 2012 17:30:27 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.3 2011/12/28 17:35:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.4 2012/01/04 17:30:27 phajdan.jr Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-1 GPL-2 BSD" #as-is
 SLOT="18"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2012-08-24  8:16 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Mueller (ulm) @ 2012-08-24  8:16 UTC (permalink / raw
  To: gentoo-commits

ulm         12/08/24 08:16:39

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  Support x32 ABI on amd64.
  
  (Portage version: 2.1.11.11/cvs/Linux x86_64)

Revision  Changes    Path
1.521                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.521&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.521&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.520&r2=1.521

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- ChangeLog	23 Aug 2012 21:04:50 -0000	1.520
+++ ChangeLog	24 Aug 2012 08:16:38 -0000	1.521
@@ -1,11 +1,12 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.520 2012/08/23 21:04:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.521 2012/08/24 08:16:38 ulm Exp $
 
-  23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-24.1-r1.ebuild:
-  arm stable, bug #431178
+  24 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  Support x32 ABI on amd64.
 
-  23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-23.4-r4.ebuild:
+  23 Aug 2012; Markus Meier <maekke@gentoo.org> emacs-23.4-r4.ebuild,
+  emacs-24.1-r1.ebuild:
   arm stable, bug #431178
 
   21 Aug 2012; Johannes Huber <johu@gentoo.org> emacs-23.4-r4.ebuild,
@@ -21,10 +22,8 @@
   emacs-24.1-r1.ebuild:
   Stable for HPPA (bug #431178).
 
-  14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-24.1-r1.ebuild:
-  Stable for amd64, wrt bug #431178
-
-  14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r4.ebuild:
+  14 Aug 2012; Agostino Sarubbo <ago@gentoo.org> emacs-23.4-r4.ebuild,
+  emacs-24.1-r1.ebuild:
   Stable for amd64, wrt bug #431178
 
 *emacs-24.1-r1 (13 Aug 2012)



1.6                  app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.5&r2=1.6

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-18.59-r8.ebuild	19 May 2012 15:58:11 -0000	1.5
+++ emacs-18.59-r8.ebuild	24 Aug 2012 08:16:38 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.5 2012/05/19 15:58:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.6 2012/08/24 08:16:38 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	mirror://gentoo/${P}-patches-7.tar.bz2"
+	mirror://gentoo/${P}-patches-8.tar.bz2"
 
 LICENSE="GPL-1 GPL-2 BSD" #as-is
 SLOT="18"
@@ -32,9 +32,16 @@
 	# autoconf? What's autoconf? We are living in 1992. ;-)
 	local arch
 	case ${ARCH} in
-		amd64) arch=intel386; multilib_toolchain_setup x86 ;;
-		x86)   arch=intel386 ;;
-		*)	   die "Architecture ${ARCH} not yet supported" ;;
+		amd64)
+			if [[ ${DEFAULT_ABI} = x32 ]]; then
+				arch=x86-x32
+				multilib_toolchain_setup x32
+			else
+				arch=intel386
+				multilib_toolchain_setup x86
+			fi ;;
+		x86) arch=intel386 ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
 	esac
 	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
 	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"





^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2013-03-18 23:13 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-03-18 23:13 UTC (permalink / raw
  To: gentoo-commits

ulm         13/03/18 23:13:13

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  The emul-linux-x86 libs are not needed for the x32 ABI.
  
  (Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.564                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.564&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.564&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.563&r2=1.564

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- ChangeLog	11 Mar 2013 19:26:52 -0000	1.563
+++ ChangeLog	18 Mar 2013 23:13:13 -0000	1.564
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.563 2013/03/11 19:26:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.564 2013/03/18 23:13:13 ulm Exp $
+
+  18 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  The emul-linux-x86 libs are not needed for the x32 ABI.
 
   11 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-24.3.ebuild:
   Fix build failure with USE=kerberos and app-crypt/heimdal, bug 461370.



1.9                  app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.8&r2=1.9

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- emacs-18.59-r8.ebuild	25 Sep 2012 19:12:18 -0000	1.8
+++ emacs-18.59-r8.ebuild	18 Mar 2013 23:13:13 -0000	1.9
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.8 2012/09/25 19:12:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.9 2013/03/18 23:13:13 ulm Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
-	amd64? ( app-emulation/emul-linux-x86-baselibs )"
+	amd64? ( !abi_x86_x32? ( app-emulation/emul-linux-x86-baselibs ) )"
 #	X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}"
 
@@ -33,13 +33,16 @@
 	local arch
 	case ${ARCH} in
 		amd64)
-			if [[ ${DEFAULT_ABI} = x32 ]]; then
+			if has x32 ${MULTILIB_ABIS}; then
 				arch=x86-x32
 				multilib_toolchain_setup x32
-			else
+			elif has x86 ${MULTILIB_ABIS}; then
 				arch=intel386
 				multilib_toolchain_setup x86
-			fi ;;
+			else
+				die "Need 32 bit ABI on amd64"
+			fi
+			;;
 		x86) arch=intel386 ;;
 		*) die "Architecture ${ARCH} not yet supported" ;;
 	esac





^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2013-08-03 22:56 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-08-03 22:56 UTC (permalink / raw
  To: gentoo-commits

ulm         13/08/03 22:56:46

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  Use pkg-config to detect ncurses, bug 457530.
  
  (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.593                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.593&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.593&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.592&r2=1.593

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- ChangeLog	3 Aug 2013 06:52:22 -0000	1.592
+++ ChangeLog	3 Aug 2013 22:56:46 -0000	1.593
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.592 2013/08/03 06:52:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.593 2013/08/03 22:56:46 ulm Exp $
+
+  03 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  Use pkg-config to detect ncurses, bug 457530.
 
   03 Aug 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
   Stable for sparc, wrt bug #476702



1.10                 app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.9&r2=1.10

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- emacs-18.59-r8.ebuild	18 Mar 2013 23:13:13 -0000	1.9
+++ emacs-18.59-r8.ebuild	3 Aug 2013 22:56:46 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.9 2013/03/18 23:13:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.10 2013/08/03 22:56:46 ulm Exp $
 
 EAPI=4
 
@@ -21,7 +21,8 @@
 	>=app-admin/eselect-emacs-1.2
 	amd64? ( !abi_x86_x32? ( app-emulation/emul-linux-x86-baselibs ) )"
 #	X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
@@ -58,6 +59,7 @@
 	END
 
 	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
 		src/s-linux.h || die
 
 	# -O3 and -finline-functions cause segmentation faults at run time.





^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2013-08-06 10:54 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-08-06 10:54 UTC (permalink / raw
  To: gentoo-commits

ulm         13/08/06 10:54:23

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  Require USE=development for emul-linux-x86-baselibs, needed for pkg-config. Call epatch_user.
  
  (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.595                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.595&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.595&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.594&r2=1.595

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- ChangeLog	4 Aug 2013 11:40:18 -0000	1.594
+++ ChangeLog	6 Aug 2013 10:54:22 -0000	1.595
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.594 2013/08/04 11:40:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.595 2013/08/06 10:54:22 ulm Exp $
+
+  06 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  Require USE=development for emul-linux-x86-baselibs, needed for pkg-config.
+  Call epatch_user.
 
   04 Aug 2013; Agostino Sarubbo <ago@gentoo.org> emacs-24.3-r2.ebuild:
   Stable for ia64, wrt bug #476702



1.11                 app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.10&r2=1.11

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- emacs-18.59-r8.ebuild	3 Aug 2013 22:56:46 -0000	1.10
+++ emacs-18.59-r8.ebuild	6 Aug 2013 10:54:22 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.10 2013/08/03 22:56:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.11 2013/08/06 10:54:22 ulm Exp $
 
 EAPI=4
 
@@ -19,7 +19,9 @@
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
-	amd64? ( !abi_x86_x32? ( app-emulation/emul-linux-x86-baselibs ) )"
+	amd64? ( !abi_x86_x32? (
+		app-emulation/emul-linux-x86-baselibs[development]
+	) )"
 #	X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -27,6 +29,7 @@
 src_prepare() {
 	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
 	EPATCH_SUFFIX=patch epatch
+	epatch_user
 }
 
 src_configure() {





^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2013-08-21 21:07 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-08-21 21:07 UTC (permalink / raw
  To: gentoo-commits

ulm         13/08/21 21:07:48

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  Add ncurses[abi_x86_32] as alternative dependency on amd64.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.598                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.598&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.598&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.597&r2=1.598

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -r1.597 -r1.598
--- ChangeLog	14 Aug 2013 06:25:43 -0000	1.597
+++ ChangeLog	21 Aug 2013 21:07:48 -0000	1.598
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.597 2013/08/14 06:25:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.598 2013/08/21 21:07:48 ulm Exp $
+
+  21 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  Add ncurses[abi_x86_32] as alternative dependency on amd64.
 
   14 Aug 2013; Ulrich Müller <ulm@gentoo.org> emacs-24.3-r2.ebuild:
   Don't call configure with --program-transform-name, upstream bug #15091.



1.12                 app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.11&r2=1.12

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- emacs-18.59-r8.ebuild	6 Aug 2013 10:54:22 -0000	1.11
+++ emacs-18.59-r8.ebuild	21 Aug 2013 21:07:48 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.11 2013/08/06 10:54:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.12 2013/08/21 21:07:48 ulm Exp $
 
 EAPI=4
 
@@ -20,7 +20,10 @@
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
 	amd64? ( !abi_x86_x32? (
-		app-emulation/emul-linux-x86-baselibs[development]
+		|| (
+			sys-libs/ncurses[abi_x86_32]
+			app-emulation/emul-linux-x86-baselibs[development]
+		)
 	) )"
 #	X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}





^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2014-03-29 11:56 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Mueller (ulm) @ 2014-03-29 11:56 UTC (permalink / raw
  To: gentoo-commits

ulm         14/03/29 11:56:09

  Modified:             ChangeLog emacs-18.59-r8.ebuild
  Log:
  Drop x32 support in stable ebuild due to broken dependency tree.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.609                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.609&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.609&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.608&r2=1.609

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -r1.608 -r1.609
--- ChangeLog	12 Mar 2014 05:27:57 -0000	1.608
+++ ChangeLog	29 Mar 2014 11:56:09 -0000	1.609
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.608 2014/03/12 05:27:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.609 2014/03/29 11:56:09 ulm Exp $
+
+  29 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild:
+  Drop x32 support in stable ebuild due to broken dependency tree.
 
   09 Mar 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> emacs-18.59-r9.ebuild:
   x86 stable wrt bug #502262



1.14                 app-editors/emacs/emacs-18.59-r8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild?r1=1.13&r2=1.14

Index: emacs-18.59-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- emacs-18.59-r8.ebuild	26 Dec 2013 16:14:00 -0000	1.13
+++ emacs-18.59-r8.ebuild	29 Mar 2014 11:56:09 -0000	1.14
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.13 2013/12/26 16:14:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.14 2014/03/29 11:56:09 ulm Exp $
 
 EAPI=4
 
@@ -19,12 +19,12 @@
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
-	amd64? ( !abi_x86_x32? (
+	amd64? (
 		|| (
 			sys-libs/ncurses[abi_x86_32(-)]
 			app-emulation/emul-linux-x86-baselibs[development]
 		)
-	) )"
+	)"
 #	X? ( x11-libs/libX11[-xcb] )
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -40,10 +40,7 @@
 	local arch
 	case ${ARCH} in
 		amd64)
-			if has x32 ${MULTILIB_ABIS}; then
-				arch=x86-x32
-				multilib_toolchain_setup x32
-			elif has x86 ${MULTILIB_ABIS}; then
+			if has x86 ${MULTILIB_ABIS}; then
 				arch=intel386
 				multilib_toolchain_setup x86
 			else





^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild
@ 2014-04-23 11:38 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 8+ messages in thread
From: Ulrich Mueller (ulm) @ 2014-04-23 11:38 UTC (permalink / raw
  To: gentoo-commits

ulm         14/04/23 11:38:37

  Modified:             ChangeLog
  Removed:              emacs-18.59-r8.ebuild
  Log:
  Remove old.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

Revision  Changes    Path
1.613                app-editors/emacs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.613&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.613&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.612&r2=1.613

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- ChangeLog	23 Apr 2014 08:47:24 -0000	1.612
+++ ChangeLog	23 Apr 2014 11:38:37 -0000	1.613
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.612 2014/04/23 08:47:24 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.613 2014/04/23 11:38:37 ulm Exp $
+
+  23 Apr 2014; Ulrich Müller <ulm@gentoo.org> -emacs-18.59-r8.ebuild:
+  Remove old.
 
   23 Apr 2014; Chema Alonso <nimiux@gentoo.org> emacs-18.59-r9.ebuild:
   Stable for amd64 wrt bug #502262





^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-04-23 11:38 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-04 17:30 [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-18.59-r8.ebuild PaweA Hajdan (phajdan.jr)
  -- strict thread matches above, loose matches on Subject: below --
2012-08-24  8:16 Ulrich Mueller (ulm)
2013-03-18 23:13 Ulrich Mueller (ulm)
2013-08-03 22:56 Ulrich Mueller (ulm)
2013-08-06 10:54 Ulrich Mueller (ulm)
2013-08-21 21:07 Ulrich Mueller (ulm)
2014-03-29 11:56 Ulrich Mueller (ulm)
2014-04-23 11:38 Ulrich Mueller (ulm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox