[gentoo-commits] proj/emacs:master commit in: app-editors/xemacs/files/, app-editors/xemacs/

2015-10-11 Thread Mats Lidell 
commit: 30283933db509646ea0696c9af807a206275da42
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Oct 11 13:34:29 2015 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Oct 11 13:34:29 2015 +
URL:https://gitweb.gentoo.org/proj/emacs.git/commit/?id=30283933

app-editors/xemacs: Sync with main tree getting gcc5 patch.

Package-Manager: portage-2.2.20.1

 app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch | 35 ++
 ...-21.5.34-r4.ebuild => xemacs-21.5.34-r5.ebuild} | 20 +++--
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
new file mode 100644
index 000..025a390
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
@@ -0,0 +1,35 @@
+diff --git a/src/lisp.h b/src/lisp.h
+--- a/src/lisp.h
 b/src/lisp.h
+@@ -1154,6 +1154,8 @@
+ 
+ /*  alignment definitions --- */
+ 
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
++(!defined (__cplusplus) || __cplusplus < 201103L)
+ /* No type has a greater alignment requirement than max_align_t.
+(except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -1163,6 +1165,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such
+that data of this type must begin at a memory address which is a
+@@ -1170,7 +1173,11 @@
+as the type itself. */
+ 
+ #ifndef ALIGNOF
+-# if defined (__GNUC__) && (__GNUC__ >= 2)
++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++#  define ALIGNOF(type) _Alignof(type)
++# elif defined (__cplusplus) && __cplusplus >= 201103L
++#  define ALIGNOF(type) alignof(type)
++# elif defined (__GNUC__) && (__GNUC__ >= 2)
+ /* gcc has an extension that gives us exactly what we want. */
+ #  define ALIGNOF(type) __alignof__ (type)
+ # elif ! defined (__cplusplus)
+
+

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
similarity index 93%
rename from app-editors/xemacs/xemacs-21.5.34-r4.ebuild
rename to app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index 1e48191..486bc7c 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.34-r2.ebuild,v 1.1 
2014/02/17 21:37:43 ulm Exp $
+# $Id$
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -19,18 +19,19 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
-   berkdb? ( >=sys-libs/db-4 !!=sys-libs/db-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
>=sys-libs/zlib-1.1.4
-   >=dev-libs/openssl-0.9.6
+   !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+   libressl? ( dev-libs/libressl )
>=media-libs/audiofile-0.2.3
gpm? ( >=sys-libs/gpm-1.19.6 )
-   postgres? ( dev-db/postgresql )
+   postgres? ( dev-db/postgresql:= )
ldap? ( net-nds/openldap )
alsa? ( media-libs/alsa-lib )
nas? ( media-libs/nas )
@@ -42,12 +43,12 @@ RDEPEND="
xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
neXt? ( x11-libs/neXtaw )
xface? ( media-libs/compface )
-   tiff? ( media-libs/tiff )
-   png? ( >=media-libs/libpng-1.2 )
-   jpeg? ( virtual/jpeg )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
canna? ( app-i18n/canna )
freewnn? ( app-i18n/freewnn )
-   >=sys-libs/ncurses-5.2
+   >=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
 
 DEPEND="${RDEPEND}
@@ -66,6 +67,7 @@ src_prepare() {
use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+   epatch "${FILESDIR}/${P}-gcc5.patch"
epatch "${FILESDIR}/${P}-destdir.patch"
 
# Some binaries and man pages are installed under suffixed names

[gentoo-commits] proj/emacs:master commit in: app-editors/xemacs/, app-editors/sxemacs/, app-editors/emacs-vcs/, ...

2015-03-31 Thread Ulrich Müller 
commit: eb7baf078af13833e61e30726f5d05356b1f0f60
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Tue Mar 31 21:45:16 2015 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Tue Mar 31 21:45:16 2015 +
URL:https://gitweb.gentoo.org/proj/emacs.git/commit/?id=eb7baf07

Update dependencies after package move of eselect modules to app-eselect.

 app-editors/emacs-vcs/ChangeLog  | 3 +++
 app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild  | 2 +-
 app-editors/emacs-xwidget/ChangeLog  | 3 +++
 app-editors/emacs-xwidget/emacs-xwidget-25.0..ebuild | 2 +-
 app-editors/sxemacs/ChangeLog| 5 -
 app-editors/sxemacs/sxemacs-22.1.15.ebuild   | 4 ++--
 app-editors/xemacs/ChangeLog | 5 -
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild  | 4 ++--
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 0e24e68..a59b7cb 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Mar 2015; Ulrich Müller u...@gentoo.org emacs-vcs-25.0.-r2.ebuild:
+  Update dependency after package move of eselect modules to app-eselect.
+
   21 Feb 2015; Ulrich Müller u...@gentoo.org -emacs-vcs-25.0.-r1.ebuild,
   emacs-vcs-25.0.-r2.ebuild:
   Sync from Portage tree. Remove old.

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
index bfc3453..b6b0910 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.-r2.ebuild
@@ -31,7 +31,7 @@ IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls 
gpm gsettings gtk g
 REQUIRED_USE=?? ( aqua X )
 
 RDEPEND=sys-libs/ncurses
-   =app-admin/eselect-emacs-1.16
+   =app-eselect/eselect-emacs-1.16
=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )

diff --git a/app-editors/emacs-xwidget/ChangeLog 
b/app-editors/emacs-xwidget/ChangeLog
index 8b1de1c..3e1c73e 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Mar 2015; Ulrich Müller u...@gentoo.org emacs-xwidget-25.0..ebuild:
+  Update dependency after package move of eselect modules to app-eselect.
+
   21 Feb 2015; Ulrich Müller u...@gentoo.org emacs-xwidget-25.0..ebuild:
   Merge changes from emacs-vcs.
 

diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0..ebuild 
b/app-editors/emacs-xwidget/emacs-xwidget-25.0..ebuild
index 2a983ca..1ee82f8 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0..ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0..ebuild
@@ -32,7 +32,7 @@ IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls 
gpm gsettings gtk g
 REQUIRED_USE=?? ( aqua X )
 
 RDEPEND=sys-libs/ncurses
-   =app-admin/eselect-emacs-1.16
+   =app-eselect/eselect-emacs-1.16
=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )

diff --git a/app-editors/sxemacs/ChangeLog b/app-editors/sxemacs/ChangeLog
index 370f53d..74d6cb5 100644
--- a/app-editors/sxemacs/ChangeLog
+++ b/app-editors/sxemacs/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-editors/sxemacs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Mar 2015; Ulrich Müller u...@gentoo.org sxemacs-22.1.15.ebuild:
+  Update blocker after package move of eselect modules to app-eselect.
+
   09 Aug 2013; Ulrich Müller u...@gentoo.org sxemacs-22.1.15.ebuild:
   Non-maintainer commit: Drop dependency on media-sound/alsa-headers because
   that package has been masked for removal; also it is not clear why it was

diff --git a/app-editors/sxemacs/sxemacs-22.1.15.ebuild 
b/app-editors/sxemacs/sxemacs-22.1.15.ebuild
index f4c7a2f..1b46a14 100644
--- a/app-editors/sxemacs/sxemacs-22.1.15.ebuild
+++ b/app-editors/sxemacs/sxemacs-22.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
@@ -64,7 +64,7 @@ DEPEND=virtual/libc
gpm? ( sys-libs/gpm )
ncurses? ( =sys-libs/ncurses-5.2 )
magic? ( sys-apps/file )
-   !app-admin/eselect-ctags
+   !app-eselect/eselect-ctags
!app-editors/emacs
!app-editors/emacs-vcs
!app-editors/xemacs

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 36b5584..d7037da 100644
--- a/app-editors/xemacs/ChangeLog
+++

[gentoo-commits] proj/emacs:master commit in: app-editors/xemacs/

2014-12-26 Thread Mats Lidell 
commit: 9b622f12cb5de1c03845a31dc06610f038e40a8a
Author: Mats Lidell matsl AT gentoo DOT org
AuthorDate: Fri Dec 26 15:55:08 2014 +
Commit: Mats Lidell matsl AT gentoo DOT org
CommitDate: Fri Dec 26 15:55:08 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=9b622f12

Move xemacs man page to man1. Remove old ebuilds.

Package-Manager: portage-2.2.14

---
 app-editors/xemacs/ChangeLog   |   8 +
 app-editors/xemacs/Manifest|   2 -
 app-editors/xemacs/xemacs-21.5.32.ebuild   | 233 ---
 app-editors/xemacs/xemacs-21.5.33.ebuild   | 235 
 app-editors/xemacs/xemacs-21.5.34-r1.ebuild| 237 
 app-editors/xemacs/xemacs-21.5.34-r2.ebuild| 246 -
 ...-21.5.34-r3.ebuild = xemacs-21.5.34-r4.ebuild} |   5 +-
 app-editors/xemacs/xemacs-21.5.34.ebuild   | 235 
 8 files changed, 11 insertions(+), 1190 deletions(-)

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 5065d4e..c66a02b 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xemacs-21.5.34-r4 (26 Dec 2014)
+
+  26 Dec 2014; Mats Lidell ma...@gentoo.org -xemacs-21.5.32.ebuild,
+  -xemacs-21.5.33.ebuild, -xemacs-21.5.34.ebuild, -xemacs-21.5.34-r1.ebuild,
+  -xemacs-21.5.34-r2.ebuild, -xemacs-21.5.34-r3.ebuild,
+  +xemacs-21.5.34-r4.ebuild:
+  Move xemacs man page to man1. Remove old ebuilds.
+
 *xemacs-21.5.34-r3 (18 Apr 2014)
 
   18 Apr 2014; Mats Lidell ma...@gentoo.org :+xemacs-21.5.34-r3.ebuild,

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 2c23d4b..f3d8501 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,4 +1,2 @@
 DIST NeXT_XEmacs.tar.gz 39571 SHA256 
35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 
611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 WHIRLPOOL 
d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
-DIST xemacs-21.5.32.tar.gz 15760224 SHA256 
5d7473fd4b9ca3278de44882ef004b0028e3ff130ed714831c885893a9cd5e7d SHA512 
2f938bedbd8ac4aea72042d4d96223edcbfee42d05b78b09e701896ebee2e2eff3f07dcf63cd0afc529afb20e45210ac7948fb8edfa211b1b81a2b38af5f1089
 WHIRLPOOL 
426894df830371ec858a44fce53cfa595aaf19b8881a41570180c8ad49809b8176274e998e060f2d62c630582ea3468127d85d56e5e604f058cd7a3b0121b69e
-DIST xemacs-21.5.33.tar.gz 15781151 SHA256 
448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 
75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151
 WHIRLPOOL 
29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454
 DIST xemacs-21.5.34.tar.gz 15816932 SHA256 
33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 
b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 WHIRLPOOL 
733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209

diff --git a/app-editors/xemacs/xemacs-21.5.32.ebuild 
b/app-editors/xemacs/xemacs-21.5.32.ebuild
deleted file mode 100644
index d13578f..000
--- a/app-editors/xemacs/xemacs-21.5.32.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 
1.12 2012/10/24 18:58:39 ulm Exp $
-
-# Note: xemacs currently does not work with a hardened profile. If you
-# want to use xemacs on a hardened profile then compile with the
-# -nopie flag in CFLAGS or help fix bug #75028.
-
-EAPI=4
-
-export WANT_AUTOCONF=2.5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION=highly customizable open source text editor and application 
development system
-HOMEPAGE=http://www.xemacs.org/;
-SRC_URI=http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
-
-LICENSE=GPL-3
-SLOT=0
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
-IUSE=alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb
-
-X_DEPEND=x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps
-
-RDEPEND=
-   berkdb? ( =sys-libs/db-4 !!sys-libs/db-4 )
-   gdbm? ( =sys-libs/gdbm-1.8.3[berkdb(+)] )
-   =sys-libs/zlib-1.1.4
-   =dev-libs/openssl-0.9.6
-   =media-libs/audiofile-0.2.3
-   gpm? (

[gentoo-commits] proj/emacs:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2014-04-17 Thread Mats Lidell 
commit: ef100e80f2f81f8899ed0f8e0f16f54dde0faab4
Author: Mats Lidell matsl AT gentoo DOT org
AuthorDate: Thu Apr 17 23:35:23 2014 +
Commit: Mats Lidell matsl AT gentoo DOT org
CommitDate: Thu Apr 17 23:35:23 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ef100e80

Avoid problem with installed elisp files in rebuilds by using DESTDIR together 
with using
without-prefix option. xemacs will in runtime find the elisp packages anyway.

Package-Manager: portage-2.2.8-r1

---
 .../xemacs/files/xemacs-21.5.34-destdir.patch  |  13 ++
 app-editors/xemacs/xemacs-21.5.34-r3.ebuild| 247 +
 2 files changed, 260 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-destdir.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-destdir.patch
new file mode 100644
index 000..c671eee
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-destdir.patch
@@ -0,0 +1,13 @@
+diff -r 66bbea0adac4 Makefile.in.in
+--- a/Makefile.in.in   Mon Apr 07 08:55:10 2014 +0200
 b/Makefile.in.in   Tue Apr 08 00:02:42 2014 +0200
+@@ -408,7 +408,7 @@
+  fi; \
+  ${INSTALL_DATA} lib-src/config.values 
$(DESTDIR)${docdir}/config.values; \
+  ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \
+- for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! 
-name CVS -print` ; \
++ for subdir in `find $(DESTDIR)${archlibdir} -type d ! -name RCS ! 
-name SCCS ! -name CVS -print` ; \
+do (cd $${subdir}  $(RM) -r RCS CVS SCCS \#* *~) ; done ; \
+   else true; fi
+ #if (defined(PDUMP)  !defined (DUMP_IN_EXEC)) || (defined (PDUMP)  
defined(WIN32_NATIVE))
+

diff --git a/app-editors/xemacs/xemacs-21.5.34-r3.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r3.ebuild
new file mode 100644
index 000..1ccbad0
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r3.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.34-r2.ebuild,v 1.1 
2014/02/17 21:37:43 ulm Exp $
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI=4
+
+export WANT_AUTOCONF=2.5
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION=highly customizable open source text editor and application 
development system
+HOMEPAGE=http://www.xemacs.org/;
+SRC_URI=http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+
+LICENSE=GPL-3+
+SLOT=0
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+IUSE=alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb
+
+X_DEPEND=x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps
+
+RDEPEND=
+   berkdb? ( =sys-libs/db-4 !!sys-libs/db-4 )
+   gdbm? ( =sys-libs/gdbm-1.8.3[berkdb(+)] )
+   =sys-libs/zlib-1.1.4
+   =dev-libs/openssl-0.9.6
+   =media-libs/audiofile-0.2.3
+   gpm? ( =sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql-base )
+   ldap? ( net-nds/openldap )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( =x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff )
+   png? ( =media-libs/libpng-1.2 )
+   jpeg? ( virtual/jpeg )
+   canna? ( app-i18n/canna )
+   freewnn? ( app-i18n/freewnn )
+   =sys-libs/ncurses-5.2
+   =app-admin/eselect-emacs-1.15
+
+DEPEND=${RDEPEND}
+   virtual/pkgconfig
+
+PDEPEND=app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )
+
+src_unpack() {
+   default_src_unpack
+
+   use neXt  unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   use neXt  cp ${WORKDIR}/NeXT.XEmacs/xemacs-icons/* 
${S}/etc/toolbar/
+   find ${S}/lisp -name '*.elc' -exec rm {} \; || die
+   epatch ${FILESDIR}/${P}-ncurses-tinfo.patch
+   epatch ${FILESDIR}/${P}-destdir.patch
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/-xemacs/' etc/ctags.1 || die
+   sed -i -e '/^\.so/s/gnuserv/-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
+}
+
+src_configure() {
+   local myconf=
+
+   if use X; then
+
+

[gentoo-commits] proj/emacs:master commit in: app-editors/xemacs/

2014-04-17 Thread Mats Lidell 
commit: 21119e0cb5a96e262f3c7cf944916ed882e6b779
Author: Mats Lidell matsl AT gentoo DOT org
AuthorDate: Fri Apr 18 00:05:06 2014 +
Commit: Mats Lidell matsl AT gentoo DOT org
CommitDate: Fri Apr 18 00:05:06 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=21119e0c

Fixed ChangeLog

Package-Manager: portage-2.2.8-r1

---
 app-editors/xemacs/ChangeLog | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 9519ac9..5065d4e 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xemacs-21.5.34-r3 (18 Apr 2014)
+
+  18 Apr 2014; Mats Lidell ma...@gentoo.org :+xemacs-21.5.34-r3.ebuild,
+  +files/xemacs-21.5.34-destdir.patch: Avoid problem with installed elisp
+  files in rebuilds by using DESTDIR together with using without-prefix
+  option. xemacs will in runtime find the elisp packages anyway.
+
 *xemacs-21.5.34-r2 (09 Mar 2014)
 
   09 Mar 2014; Ulrich Müller u...@gentoo.org +xemacs-21.5.34-r2.ebuild:

[gentoo-commits] proj/emacs:master commit in: app-editors/xemacs/

2014-03-09 Thread Ulrich Müller 
commit: f827e36030ea49bbb422a854dc4c3c1ac981e48d
Author: Ulrich Müller ulm AT gentoo DOT org
AuthorDate: Sun Mar  9 10:49:03 2014 +
Commit: Ulrich Müller ulm AT gentoo DOT org
CommitDate: Sun Mar  9 10:49:03 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=f827e360

Sync from Portage tree: Install gnuserv binaries with -xemacs suffix to avoid 
file collisions with app-emacs/gnuserv; active versions of gnuclient and 
gnudoit can now be selected with the gnuclient eselect module, bug 177936.

Package-Manager: portage-2.2.8-r1

---
 app-editors/xemacs/ChangeLog|   7 +
 app-editors/xemacs/xemacs-21.5.34-r2.ebuild | 246 
 2 files changed, 253 insertions(+)

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 571f87e..9519ac9 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xemacs-21.5.34-r2 (09 Mar 2014)
+
+  09 Mar 2014; Ulrich Müller u...@gentoo.org +xemacs-21.5.34-r2.ebuild:
+  Sync from Portage tree: Install gnuserv binaries with -xemacs suffix to avoid
+  file collisions with app-emacs/gnuserv; active versions of gnuclient and
+  gnudoit can now be selected with the gnuclient eselect module, bug 177936.
+
 *xemacs-21.5.34-r1 (01 Feb 2014)
 
   01 Feb 2014: Mats Lidell ma...@gentoo.org +xemacs-21.5.34-r1.ebuild,

diff --git a/app-editors/xemacs/xemacs-21.5.34-r2.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r2.ebuild
new file mode 100644
index 000..f376166
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.34-r2.ebuild,v 1.1 
2014/02/17 21:37:43 ulm Exp $
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI=4
+
+export WANT_AUTOCONF=2.5
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION=highly customizable open source text editor and application 
development system
+HOMEPAGE=http://www.xemacs.org/;
+SRC_URI=http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+
+LICENSE=GPL-3+
+SLOT=0
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+IUSE=alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb
+
+X_DEPEND=x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps
+
+RDEPEND=
+   berkdb? ( =sys-libs/db-4 !!sys-libs/db-4 )
+   gdbm? ( =sys-libs/gdbm-1.8.3[berkdb(+)] )
+   =sys-libs/zlib-1.1.4
+   =dev-libs/openssl-0.9.6
+   =media-libs/audiofile-0.2.3
+   gpm? ( =sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql-base )
+   ldap? ( net-nds/openldap )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( =x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff )
+   png? ( =media-libs/libpng-1.2 )
+   jpeg? ( virtual/jpeg )
+   canna? ( app-i18n/canna )
+   freewnn? ( app-i18n/freewnn )
+   =sys-libs/ncurses-5.2
+   =app-admin/eselect-emacs-1.15
+
+DEPEND=${RDEPEND}
+   virtual/pkgconfig
+
+PDEPEND=app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )
+
+src_unpack() {
+   default_src_unpack
+
+   use neXt  unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   use neXt  cp ${WORKDIR}/NeXT.XEmacs/xemacs-icons/* 
${S}/etc/toolbar/
+   find ${S}/lisp -name '*.elc' -exec rm {} \; || die
+   epatch ${FILESDIR}/${P}-ncurses-tinfo.patch
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/-xemacs/' etc/ctags.1 || die
+   sed -i -e '/^\.so/s/gnuserv/-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
+}
+
+src_configure() {
+   local myconf=
+
+   if use X; then
+
+   myconf=${myconf} --with-widgets=athena
+   myconf=${myconf} --with-dialogs=athena
+   myconf=${myconf} --with-menubars=lucid
+   myconf=${myconf} --with-scrollbars=lucid
+   if use motif ; then
+