* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2013-06-15 16:20 Ulrich Mueller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Mueller @ 2013-06-15 16:20 UTC (permalink / raw
To: gentoo-commits
commit: a50acecc9191b08a44972307c81727ecfa618b97
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 16:10:18 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 16:10:18 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=a50acecc
Merge changes from emacs-vcs.
Package-Manager: portage-2.1.12.4
---
app-editors/emacs-xwidget/ChangeLog | 4 ++++
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 6 ++++--
app-editors/emacs-xwidget/metadata.xml | 2 ++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 020e55f..4a98282 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
+ metadata.xml:
+ Merge changes from emacs-vcs.
+
08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge some changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index d7c480e..6515c5f 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
@@ -42,6 +42,7 @@ RDEPEND="sys-libs/ncurses
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
+ gfile? ( >=dev-libs/glib-2.28.6 )
gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
@@ -92,6 +93,7 @@ RDEPEND="sys-libs/ncurses
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
+ gfile? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
@@ -236,12 +238,12 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
+ --with-file-notification=$(usev gfile || usev inotify || echo no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
- $(use_with inotify) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml
index aed3cc2..7e27373 100644
--- a/app-editors/emacs-xwidget/metadata.xml
+++ b/app-editors/emacs-xwidget/metadata.xml
@@ -22,6 +22,8 @@
<flag name='games'>Support shared score files for games</flag>
<flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
font name</flag>
+ <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+ notification</flag>
<flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
system font name</flag>
<flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2016-01-31 8:26 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2016-01-31 8:26 UTC (permalink / raw
To: gentoo-commits
commit: 5d84596579238bc4d8c2023757c51a85acadee73
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 08:25:37 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 08:25:37 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs.git/commit/?id=5d845965
app-editors/emacs-xwidget: Remove package, xwidget merged to emacs-25.
app-editors/emacs-xwidget/ChangeLog | 97 ------
.../emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 375 ---------------------
app-editors/emacs-xwidget/metadata.xml | 52 ---
3 files changed, 524 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
deleted file mode 100644
index 0b4cc55..0000000
--- a/app-editors/emacs-xwidget/ChangeLog
+++ /dev/null
@@ -1,97 +0,0 @@
-# ChangeLog for app-editors/emacs-xwidget
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
- 31 Mar 2015; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
- Update dependency after package move of eselect modules to app-eselect.
-
- 21 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 01 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild,
- metadata.xml:
- Merge changes from emacs-vcs.
-
- 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
- Set a fake version number to avoid collisions with emacs-vcs.
-
-*emacs-xwidget-25.0.9999 (29 Dec 2014)
-
- 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.4.9999.ebuild,
- +emacs-xwidget-25.0.9999.ebuild:
- Upstream version number has changed. Merge changes from emacs-vcs.
-
- 13 Nov 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.4.9999.ebuild:
- Merge changes from emacs-vcs.
-
-*emacs-xwidget-24.4.9999 (07 Jun 2014)
-
- 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.3.9999.ebuild,
- +emacs-xwidget-24.4.9999.ebuild:
- Upstream version number has changed.
-
- 06 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Switch from package.mask to empty KEYWORDS.
-
- 16 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Install README.xwidget.
-
- 14 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 15 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
- metadata.xml:
- Merge changes from emacs-vcs.
-
- 08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge some changes from emacs-vcs.
-
- 31 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from Portage tree.
-
- 27 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
- metadata.xml:
- Merge changes from emacs-vcs.
-
- 21 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
- metadata.xml:
- Merge changes from emacs-vcs.
-
-*emacs-xwidget-24.3.9999 (17 Nov 2012)
-
- 17 Nov 2012; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.2.9999.ebuild,
- +emacs-xwidget-24.3.9999.ebuild:
- Version number has changed upstream.
-
- 24 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.2.9999.ebuild:
- Update dependency after package move from x11-libs/openmotif to
- x11-libs/motif.
-
- 05 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.2.9999.ebuild:
- With USE=xwidgets, add webkit-gtk as dependency and enable gtk3. Drop ~hppa
- and ~sh keywords.
-
-*emacs-xwidget-24.2.9999 (04 Oct 2012)
-
- 04 Oct 2012; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.0.9999.ebuild,
- +emacs-xwidget-24.2.9999.ebuild, metadata.xml:
- Update from emacs-vcs ebuild.
-
-*emacs-xwidget-24.0.9999 (30 Sep 2011)
-
- 30 Sep 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-xwidget-24.0.9999.ebuild,
- +metadata.xml:
- Emacs xwidget branch.
-
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
deleted file mode 100644
index 039b383..0000000
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
- EGIT_BRANCH="xwidget"
- EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
- S="${EGIT_CHECKOUT_DIR}"
-else
- SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
- mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
- # FULL_VERSION keeps the full version number, which is needed in
- # order to determine some path information correctly for copy/move
- # operations later on
- FULL_VERSION="${PV%%_*}"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/
- http://www.emacswiki.org/emacs/EmacsXembed"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-eselect/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
- net-libs/liblockfile
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- dbus? ( sys-apps/dbus )
- gfile? ( >=dev-libs/glib-2.28.6 )
- gnutls? ( net-libs/gnutls )
- gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
- selinux? ( sys-libs/libselinux )
- zlib? ( sys-libs/zlib )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gsettings? ( >=dev-libs/glib-2.28.6 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff:0 )
- xpm? ( x11-libs/libXpm )
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk3? (
- x11-libs/gtk+:3
- xwidgets? (
- >=dev-libs/gobject-introspection-1.32.1
- net-libs/webkit-gtk:3
- )
- )
- !gtk3? (
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-if [[ ${PV##*.} = 9999 ]]; then
- DEPEND="${DEPEND}
- sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- # set a fake version number to avoid collisions with emacs-vcs
- sed -i -e "/AC_INIT/s/\(25\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
-
- if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
- configure.ac)
- [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
- einfo "Emacs branch: ${EGIT_BRANCH}"
- einfo "Commit: ${EGIT_VERSION}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- fi
-
- epatch_user
-
- # Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
- || die "unable to sed ctags.1"
-
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
- filter-flags -pie #526948
-
- if use sh; then
- replace-flags "-O[1-9]" -O0 #262359
- elif use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa; then
- use sound || ewarn \
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
- myconf+=" --with-sound=alsa"
- else
- myconf+=" --with-sound=$(usex sound oss)"
- fi
-
- if use X; then
- myconf+=" --with-x --without-ns"
- myconf+=" $(use_with gconf)"
- myconf+=" $(use_with gsettings)"
- myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
- myconf+=" $(use_with xpm)"
- myconf+=" $(use_with imagemagick)"
-
- if use xft; then
- myconf+=" --with-xft"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- myconf+=" --without-xft"
- myconf+=" --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
- fi
-
- if use gtk3; then
- einfo "Configuring to build with GIMP Toolkit (GTK+) version 3"
- myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
- elif use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+) version 2"
- myconf+=" --with-x-toolkit=gtk2"
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
-
- local f tk
- for f in gtk3 gtk motif Xaw3d athena; do
- use ${f} || continue
- [[ ${tk} = gtk* || ${tk} = motif ]] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- : ${tk:=${f}}
- done
- ! use gtk3 && use xwidgets && ewarn \
- "USE flag \"xwidgets\" has no effect if \"gtk3\" is not set."
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --localstatedir="${EPREFIX}"/var \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser=":gamestat" \
- --without-compress-install \
- --with-file-notification=$(usev gfile || usev inotify || echo no) \
- $(use_enable acl) \
- $(use_with dbus) \
- $(use_with gnutls) \
- $(use_with gpm) \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- $(use_with wide-int) \
- $(use_with zlib) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake
-}
-
-src_install () {
- emake DESTDIR="${D}" NO_BIN_LINK=t install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "moving emacs executable failed"
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
- || die "moving emacs man page failed"
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- # remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
- if use gzip-el; then
- # compress .el files when a corresponding .elc exists
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
- assert "gzip .el failed"
- fi
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS CONTRIBUTE
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
- strongly recommended that you use app-admin/emacs-updater to rebuild
- all byte-compiled elisp files of the installed Emacs packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
- it into /Applications by yourself."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
-
- local pvr
- for pvr in ${REPLACING_VERSIONS}; do
- [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
- done
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
- # refresh symlinks in case any installed files have changed
- eselect emacs set ${EMACS_SUFFIX}
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml
deleted file mode 100644
index efe2017..0000000
--- a/app-editors/emacs-xwidget/metadata.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnu-emacs@gentoo.org</email>
- <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<longdescription>
- GNU Emacs is an extensible, customizable text editor - and more. At its core
- is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
- with extensions to support text editing. The features of GNU Emacs include:
- * Content-sensitive editing modes, including syntax coloring, for a variety
- of file types including plain text, source code, and HTML.
- * Complete built-in documentation, including a tutorial for new users.
- * Full Unicode support for nearly all human languages and their scripts.
- * Highly customizable, using Emacs Lisp code or a graphical interface.
- * A large number of extensions that add other functionality, including a
- project planner, mail and news reader, debugger interface, calendar, and
- more. Many of these extensions are distributed with GNU Emacs; others are
- available separately.
-</longdescription>
-<use>
- <flag name='athena'>Enable the MIT Athena widget set
- (<pkg>x11-libs/libXaw</pkg>)</flag>
- <flag name='games'>Support shared score files for games</flag>
- <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
- font name</flag>
- <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
- notification</flag>
- <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
- system font name</flag>
- <flag name='gtk'>Add support for <pkg>x11-libs/gtk+</pkg>
- (the GIMP Toolkit) version 2</flag>
- <flag name='gtk3'>Add support for <pkg>x11-libs/gtk+</pkg>
- (the GIMP Toolkit) version 3</flag>
- <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
- <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
- <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
- processing</flag>
- <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
- of the internal Lisp implementations</flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
- <flag name='source'>Install C source files and make them available for
- find-function</flag>
- <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
- preference to Emacs' own scrollbars</flag>
- <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
- This option has an effect only on architectures where "long" and
- "long long" types have different size.</flag>
- <flag name='xwidgets'>Enable use of some gtk widgets in Emacs buffers</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2015-02-21 23:11 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2015-02-21 23:11 UTC (permalink / raw
To: gentoo-commits
commit: e188eed43bb6584484e3f5399c7c0457a014782f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 23:10:39 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 23:10:39 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=e188eed4
app-editors/emacs-xwidget: Merge changes from emacs-vcs.
Package-Manager: portage-2.2.17
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 73ee722..8b1de1c 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: $
+ 21 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
+ Merge changes from emacs-vcs.
+
01 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild,
metadata.xml:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
index dbbfa36..2a983ca 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+ >=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -56,7 +56,7 @@ RDEPEND="sys-libs/ncurses
jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
xft? (
@@ -219,7 +219,7 @@ src_configure() {
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--localstatedir="${EPREFIX}"/var \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
+ --with-gameuser=":gamestat" \
--without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo no) \
$(use_enable acl) \
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2015-02-01 21:31 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2015-02-01 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 6d994cfe3e5eaa1b3624452c60f7b7c6ba9b2c48
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 1 21:31:17 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 21:31:17 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6d994cfe
Revert "app-editors/emacs-xwidget: Remove package, the xwidget branch has been merged to master."
This reverts commit 2607fdefd97e80f126e9781022ede0c94cdec670.
---
app-editors/emacs-xwidget/ChangeLog | 87 +++++
.../emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 375 +++++++++++++++++++++
app-editors/emacs-xwidget/metadata.xml | 48 +++
3 files changed, 510 insertions(+)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
new file mode 100644
index 0000000..1cec23c
--- /dev/null
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -0,0 +1,87 @@
+# ChangeLog for app-editors/emacs-xwidget
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
+ Set a fake version number to avoid collisions with emacs-vcs.
+
+*emacs-xwidget-25.0.9999 (29 Dec 2014)
+
+ 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.4.9999.ebuild,
+ +emacs-xwidget-25.0.9999.ebuild:
+ Upstream version number has changed. Merge changes from emacs-vcs.
+
+ 13 Nov 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.4.9999.ebuild:
+ Merge changes from emacs-vcs.
+
+*emacs-xwidget-24.4.9999 (07 Jun 2014)
+
+ 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.3.9999.ebuild,
+ +emacs-xwidget-24.4.9999.ebuild:
+ Upstream version number has changed.
+
+ 06 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
+ 13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
+ 19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
+ 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
+ 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Switch from package.mask to empty KEYWORDS.
+
+ 16 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Install README.xwidget.
+
+ 14 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
+ 15 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
+ metadata.xml:
+ Merge changes from emacs-vcs.
+
+ 08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge some changes from emacs-vcs.
+
+ 31 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from Portage tree.
+
+ 27 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
+ metadata.xml:
+ Merge changes from emacs-vcs.
+
+ 21 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
+ metadata.xml:
+ Merge changes from emacs-vcs.
+
+*emacs-xwidget-24.3.9999 (17 Nov 2012)
+
+ 17 Nov 2012; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.2.9999.ebuild,
+ +emacs-xwidget-24.3.9999.ebuild:
+ Version number has changed upstream.
+
+ 24 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.2.9999.ebuild:
+ Update dependency after package move from x11-libs/openmotif to
+ x11-libs/motif.
+
+ 05 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.2.9999.ebuild:
+ With USE=xwidgets, add webkit-gtk as dependency and enable gtk3. Drop ~hppa
+ and ~sh keywords.
+
+*emacs-xwidget-24.2.9999 (04 Oct 2012)
+
+ 04 Oct 2012; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.0.9999.ebuild,
+ +emacs-xwidget-24.2.9999.ebuild, metadata.xml:
+ Update from emacs-vcs ebuild.
+
+*emacs-xwidget-24.0.9999 (30 Sep 2011)
+
+ 30 Sep 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-xwidget-24.0.9999.ebuild,
+ +metadata.xml:
+ Emacs xwidget branch.
+
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
new file mode 100644
index 0000000..7ae4df6
--- /dev/null
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+if [[ ${PV##*.} = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
+ EGIT_BRANCH="xwidget"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+ S="${EGIT_CHECKOUT_DIR}"
+else
+ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
+ mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+ # FULL_VERSION keeps the full version number, which is needed in
+ # order to determine some path information correctly for copy/move
+ # operations later on
+ FULL_VERSION="${PV%%_*}"
+ S="${WORKDIR}/emacs-${FULL_VERSION}"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/
+ http://www.emacswiki.org/emacs/EmacsXembed"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="25"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses
+ >=app-admin/eselect-emacs-1.16
+ >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+ net-libs/liblockfile
+ acl? ( virtual/acl )
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( sys-apps/dbus )
+ gfile? ( >=dev-libs/glib-2.28.6 )
+ gnutls? ( net-libs/gnutls )
+ gpm? ( sys-libs/gpm )
+ hesiod? ( net-dns/hesiod )
+ kerberos? ( virtual/krb5 )
+ libxml2? ( >=dev-libs/libxml2-2.2.0 )
+ selinux? ( sys-libs/libselinux )
+ zlib? ( sys-libs/zlib )
+ X? (
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-misc/xbitmaps
+ gconf? ( >=gnome-base/gconf-2.26.2 )
+ gsettings? ( >=dev-libs/glib-2.28.6 )
+ gif? ( media-libs/giflib )
+ jpeg? ( virtual/jpeg:0= )
+ png? ( >=media-libs/libpng-1.4:0= )
+ svg? ( >=gnome-base/librsvg-2.0 )
+ tiff? ( media-libs/tiff )
+ xpm? ( x11-libs/libXpm )
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
+ xft? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ m17n-lib? (
+ >=dev-libs/libotf-0.9.4
+ >=dev-libs/m17n-lib-1.5.1
+ )
+ )
+ gtk3? (
+ x11-libs/gtk+:3
+ xwidgets? (
+ >=dev-libs/gobject-introspection-1.32.1
+ net-libs/webkit-gtk:3
+ )
+ )
+ !gtk3? (
+ gtk? ( x11-libs/gtk+:2 )
+ !gtk? (
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ Xaw3d? ( x11-libs/libXaw3d )
+ !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+ )
+ )
+ )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ gzip-el? ( app-arch/gzip )
+ pax_kernel? (
+ sys-apps/attr
+ sys-apps/paxctl
+ )"
+
+if [[ ${PV##*.} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ sys-apps/texinfo"
+fi
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+ # set a fake version number to avoid collisions with emacs-vcs
+ sed -i -e "/AC_INIT/s/\(25\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
+
+ if [[ ${PV##*.} = 9999 ]]; then
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+ configure.ac)
+ [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+ einfo "Emacs branch: ${EGIT_BRANCH}"
+ einfo "Commit: ${EGIT_VERSION}"
+ einfo "Emacs version number: ${FULL_VERSION}"
+ [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+ || die "Upstream version number changed to ${FULL_VERSION}"
+ fi
+
+ epatch_user
+
+ # Fix filename reference in redirected man page
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+ || die "unable to sed ctags.1"
+
+ AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+ strip-flags
+ filter-flags -pie #526948
+
+ if use sh; then
+ replace-flags "-O[1-9]" -O0 #262359
+ elif use ia64; then
+ replace-flags "-O[2-9]" -O1 #325373
+ else
+ replace-flags "-O[3-9]" -O2
+ fi
+
+ local myconf
+
+ if use alsa; then
+ use sound || ewarn \
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+ myconf+=" --with-sound=alsa"
+ else
+ myconf+=" --with-sound=$(usex sound oss)"
+ fi
+
+ if use X; then
+ myconf+=" --with-x --without-ns"
+ myconf+=" $(use_with gconf)"
+ myconf+=" $(use_with gsettings)"
+ myconf+=" $(use_with toolkit-scroll-bars)"
+ myconf+=" $(use_with gif)"
+ myconf+=" $(use_with jpeg)"
+ myconf+=" $(use_with png)"
+ myconf+=" $(use_with svg rsvg)"
+ myconf+=" $(use_with tiff)"
+ myconf+=" $(use_with xpm)"
+ myconf+=" $(use_with imagemagick)"
+
+ if use xft; then
+ myconf+=" --with-xft"
+ myconf+=" $(use_with m17n-lib libotf)"
+ myconf+=" $(use_with m17n-lib m17n-flt)"
+ else
+ myconf+=" --without-xft"
+ myconf+=" --without-libotf --without-m17n-flt"
+ use m17n-lib && ewarn \
+ "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+ fi
+
+ if use gtk3; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+) version 3"
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+ elif use gtk; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+) version 2"
+ myconf+=" --with-x-toolkit=gtk2"
+ elif use motif; then
+ einfo "Configuring to build with Motif toolkit"
+ myconf+=" --with-x-toolkit=motif"
+ elif use athena || use Xaw3d; then
+ einfo "Configuring to build with Athena/Lucid toolkit"
+ myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+ else
+ einfo "Configuring to build with no toolkit"
+ myconf+=" --with-x-toolkit=no"
+ fi
+
+ local f tk
+ for f in gtk3 gtk motif Xaw3d athena; do
+ use ${f} || continue
+ [[ ${tk} = gtk* || ${tk} = motif ]] \
+ && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
+ : ${tk:=${f}}
+ done
+ ! use gtk3 && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk3\" is not set."
+ elif use aqua; then
+ einfo "Configuring to build with Nextstep (Cocoa) support"
+ myconf+=" --with-ns --disable-ns-self-contained"
+ myconf+=" --without-x"
+ else
+ myconf+=" --without-x --without-ns"
+ fi
+
+ # Save version information in the Emacs binary. It will be available
+ # in variable "system-configuration-options".
+ myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+ if [[ ${PV##*.} = 9999 ]]; then
+ myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
+ fi
+
+ econf \
+ --program-suffix="-${EMACS_SUFFIX}" \
+ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+ --localstatedir="${EPREFIX}"/var \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+ --with-gameuser="${GAMES_USER_DED:-games}" \
+ --without-compress-install \
+ --with-file-notification=$(usev gfile || usev inotify || echo no) \
+ $(use_enable acl) \
+ $(use_with dbus) \
+ $(use_with gnutls) \
+ $(use_with gpm) \
+ $(use_with hesiod) \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
+ $(use_with libxml2 xml2) \
+ $(use_with selinux) \
+ $(use_with wide-int) \
+ $(use_with zlib) \
+ ${myconf}
+}
+
+src_compile() {
+ export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
+ emake
+}
+
+src_install () {
+ emake DESTDIR="${D}" NO_BIN_LINK=t install
+
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+ || die "moving emacs executable failed"
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+ || die "moving emacs man page failed"
+
+ # move info dir to avoid collisions with the dir file generated by portage
+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+ || die "moving info dir failed"
+ touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+ docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+ # avoid collision between slots, see bug #169033 e.g.
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+ rm -rf "${ED}"/var
+
+ # remove unused <version>/site-lisp dir
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+ # remove COPYING file (except for etc/COPYING used by describe-copying)
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+ if use gzip-el; then
+ # compress .el files when a corresponding .elc exists
+ find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+ -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+ assert "gzip .el failed"
+ fi
+
+ local cdir
+ if use source; then
+ cdir="/usr/share/emacs/${FULL_VERSION}/src"
+ insinto "${cdir}"
+ # This is not meant to install all the source -- just the
+ # C source you might find via find-function
+ doins src/*.{c,h,m}
+ elif has installsources ${FEATURES}; then
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+ fi
+
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+ X
+ ;;; ${PN}-${SLOT} site-lisp configuration
+ X
+ (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+ Y (setq find-function-C-source-directory
+ Y "${EPREFIX}${cdir}")
+ X (let ((path (getenv "INFOPATH"))
+ X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+ X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+ X (and path
+ X ;; move Emacs Info dir before anything else in /usr/share/info
+ X (let* ((p (cons nil (split-string path ":" t))) (q p))
+ X (while (and (cdr q) (not (string-match re (cadr q))))
+ X (setq q (cdr q)))
+ X (setcdr q (cons dir (delete dir (cdr q))))
+ X (setq Info-directory-list (prune-directory-list (cdr p)))))))
+ EOF
+ elisp-site-file-install "${T}/${SITEFILE}" || die
+
+ dodoc README README.xwidget BUGS CONTRIBUTE
+
+ if use aqua; then
+ dodir /Applications/Gentoo
+ rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+ mv nextstep/Emacs.app \
+ "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+ fi
+
+ DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+ through the Emacs eselect module, which also redirects man and info
+ pages. Therefore, several Emacs versions can be installed at the
+ same time. \"man emacs.eselect\" for details.
+ \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
+ strongly recommended that you use app-admin/emacs-updater to rebuild
+ all byte-compiled elisp files of the installed Emacs packages."
+ use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+ Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+ machine would satisfy basic Emacs requirements under X11.
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+ for how to enable anti-aliased fonts."
+ use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+ \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+ it into /Applications by yourself."
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # move Info dir file to correct name
+ local infodir=/usr/share/info/${EMACS_SUFFIX} f
+ if [[ -f ${ED}${infodir}/dir.orig ]]; then
+ mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+ elif [[ -d "${ED}"${infodir} ]]; then
+ # this should not happen in EAPI 4
+ ewarn "Regenerating Info directory index in ${infodir} ..."
+ rm -f "${ED}"${infodir}/dir{,.*}
+ for f in "${ED}"${infodir}/*; do
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+ install-info --info-dir="${ED}"${infodir} "${f}" \
+ || die "install-info failed"
+ fi
+ done
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+
+ local pvr
+ for pvr in ${REPLACING_VERSIONS}; do
+ [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
+ done
+ readme.gentoo_print_elog
+
+ if use livecd; then
+ # force an update of the emacs symlink for the livecd/dvd,
+ # because some microemacs packages set it with USE=livecd
+ eselect emacs update
+ elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+ # refresh symlinks in case any installed files have changed
+ eselect emacs set ${EMACS_SUFFIX}
+ else
+ eselect emacs update ifunset
+ fi
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ eselect emacs update ifunset
+}
diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml
new file mode 100644
index 0000000..7e27373
--- /dev/null
+++ b/app-editors/emacs-xwidget/metadata.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>emacs</herd>
+<longdescription>
+ GNU Emacs is an extensible, customizable text editor - and more. At its core
+ is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
+ with extensions to support text editing. The features of GNU Emacs include:
+ * Content-sensitive editing modes, including syntax coloring, for a variety
+ of file types including plain text, source code, and HTML.
+ * Complete built-in documentation, including a tutorial for new users.
+ * Full Unicode support for nearly all human languages and their scripts.
+ * Highly customizable, using Emacs Lisp code or a graphical interface.
+ * A large number of extensions that add other functionality, including a
+ project planner, mail and news reader, debugger interface, calendar, and
+ more. Many of these extensions are distributed with GNU Emacs; others are
+ available separately.
+</longdescription>
+<use>
+ <flag name='athena'>Enable the MIT Athena widget set
+ (<pkg>x11-libs/libXaw</pkg>)</flag>
+ <flag name='games'>Support shared score files for games</flag>
+ <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
+ font name</flag>
+ <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+ notification</flag>
+ <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
+ system font name</flag>
+ <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
+ version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
+ <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
+ <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
+ <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
+ processing</flag>
+ <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
+ of the internal Lisp implementations</flag>
+ <flag name='pax_kernel'>Enable building under a PaX enabled kernel
+ (<pkg>sys-apps/paxctl</pkg>)</flag>
+ <flag name='source'>Install C source files and make them available for
+ find-function</flag>
+ <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
+ preference to Emacs' own scrollbars</flag>
+ <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
+ This option has an effect only on architectures where "long" and
+ "long long" types have different size.</flag>
+ <flag name='xwidgets'>Enable use of some gtk widgets it Emacs buffers</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2015-02-01 21:31 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2015-02-01 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 6f4e9df5b9cc71d330ccb73104e46fdfce0733e4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 1 21:35:20 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 21:35:20 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6f4e9df5
app-editors/emacs-xwidget: Merge changes from emacs-vcs.
Package-Manager: portage-2.2.15
---
app-editors/emacs-xwidget/ChangeLog | 6 +++++-
app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 4 ++--
app-editors/emacs-xwidget/metadata.xml | 11 ++++++-----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 1cec23c..73ee722 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for app-editors/emacs-xwidget
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 01 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild,
+ metadata.xml:
+ Merge changes from emacs-vcs.
+
29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
Set a fake version number to avoid collisions with emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
index 7ae4df6..dbbfa36 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -303,7 +303,7 @@ src_install () {
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
- dodoc README README.xwidget BUGS CONTRIBUTE
+ dodoc README BUGS CONTRIBUTE
if use aqua; then
dodir /Applications/Gentoo
diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml
index 7e27373..c2cefd0 100644
--- a/app-editors/emacs-xwidget/metadata.xml
+++ b/app-editors/emacs-xwidget/metadata.xml
@@ -26,16 +26,17 @@
notification</flag>
<flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
system font name</flag>
- <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
+ <flag name='gtk'>Add support for <pkg>x11-libs/gtk+</pkg>
+ (the GIMP Toolkit) version 2</flag>
+ <flag name='gtk3'>Add support for <pkg>x11-libs/gtk+</pkg>
+ (the GIMP Toolkit) version 3</flag>
<flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
<flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
<flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
processing</flag>
<flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
of the internal Lisp implementations</flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel
- (<pkg>sys-apps/paxctl</pkg>)</flag>
+ <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
<flag name='source'>Install C source files and make them available for
find-function</flag>
<flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
@@ -43,6 +44,6 @@
<flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
This option has an effect only on architectures where "long" and
"long long" types have different size.</flag>
- <flag name='xwidgets'>Enable use of some gtk widgets it Emacs buffers</flag>
+ <flag name='xwidgets'>Enable use of some gtk widgets in Emacs buffers</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2015-02-01 15:51 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2015-02-01 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 2607fdefd97e80f126e9781022ede0c94cdec670
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 1 15:52:17 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 15:52:17 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=2607fdef
app-editors/emacs-xwidget: Remove package, the xwidget branch has been merged to master.
---
app-editors/emacs-xwidget/ChangeLog | 87 -----
.../emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 375 ---------------------
app-editors/emacs-xwidget/metadata.xml | 48 ---
3 files changed, 510 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
deleted file mode 100644
index 1cec23c..0000000
--- a/app-editors/emacs-xwidget/ChangeLog
+++ /dev/null
@@ -1,87 +0,0 @@
-# ChangeLog for app-editors/emacs-xwidget
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
- Set a fake version number to avoid collisions with emacs-vcs.
-
-*emacs-xwidget-25.0.9999 (29 Dec 2014)
-
- 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.4.9999.ebuild,
- +emacs-xwidget-25.0.9999.ebuild:
- Upstream version number has changed. Merge changes from emacs-vcs.
-
- 13 Nov 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.4.9999.ebuild:
- Merge changes from emacs-vcs.
-
-*emacs-xwidget-24.4.9999 (07 Jun 2014)
-
- 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.3.9999.ebuild,
- +emacs-xwidget-24.4.9999.ebuild:
- Upstream version number has changed.
-
- 06 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Switch from package.mask to empty KEYWORDS.
-
- 16 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Install README.xwidget.
-
- 14 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs.
-
- 15 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
- metadata.xml:
- Merge changes from emacs-vcs.
-
- 08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge some changes from emacs-vcs.
-
- 31 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from Portage tree.
-
- 27 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
- metadata.xml:
- Merge changes from emacs-vcs.
-
- 21 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
- metadata.xml:
- Merge changes from emacs-vcs.
-
-*emacs-xwidget-24.3.9999 (17 Nov 2012)
-
- 17 Nov 2012; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.2.9999.ebuild,
- +emacs-xwidget-24.3.9999.ebuild:
- Version number has changed upstream.
-
- 24 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.2.9999.ebuild:
- Update dependency after package move from x11-libs/openmotif to
- x11-libs/motif.
-
- 05 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.2.9999.ebuild:
- With USE=xwidgets, add webkit-gtk as dependency and enable gtk3. Drop ~hppa
- and ~sh keywords.
-
-*emacs-xwidget-24.2.9999 (04 Oct 2012)
-
- 04 Oct 2012; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.0.9999.ebuild,
- +emacs-xwidget-24.2.9999.ebuild, metadata.xml:
- Update from emacs-vcs ebuild.
-
-*emacs-xwidget-24.0.9999 (30 Sep 2011)
-
- 30 Sep 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-xwidget-24.0.9999.ebuild,
- +metadata.xml:
- Emacs xwidget branch.
-
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
deleted file mode 100644
index 7ae4df6..0000000
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
- EGIT_BRANCH="xwidget"
- EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
- S="${EGIT_CHECKOUT_DIR}"
-else
- SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
- mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
- # FULL_VERSION keeps the full version number, which is needed in
- # order to determine some path information correctly for copy/move
- # operations later on
- FULL_VERSION="${PV%%_*}"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/
- http://www.emacswiki.org/emacs/EmacsXembed"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
- net-libs/liblockfile
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- dbus? ( sys-apps/dbus )
- gfile? ( >=dev-libs/glib-2.28.6 )
- gnutls? ( net-libs/gnutls )
- gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
- selinux? ( sys-libs/libselinux )
- zlib? ( sys-libs/zlib )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gsettings? ( >=dev-libs/glib-2.28.6 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk3? (
- x11-libs/gtk+:3
- xwidgets? (
- >=dev-libs/gobject-introspection-1.32.1
- net-libs/webkit-gtk:3
- )
- )
- !gtk3? (
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-if [[ ${PV##*.} = 9999 ]]; then
- DEPEND="${DEPEND}
- sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- # set a fake version number to avoid collisions with emacs-vcs
- sed -i -e "/AC_INIT/s/\(25\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
-
- if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
- configure.ac)
- [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
- einfo "Emacs branch: ${EGIT_BRANCH}"
- einfo "Commit: ${EGIT_VERSION}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- fi
-
- epatch_user
-
- # Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
- || die "unable to sed ctags.1"
-
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
- filter-flags -pie #526948
-
- if use sh; then
- replace-flags "-O[1-9]" -O0 #262359
- elif use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa; then
- use sound || ewarn \
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
- myconf+=" --with-sound=alsa"
- else
- myconf+=" --with-sound=$(usex sound oss)"
- fi
-
- if use X; then
- myconf+=" --with-x --without-ns"
- myconf+=" $(use_with gconf)"
- myconf+=" $(use_with gsettings)"
- myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
- myconf+=" $(use_with xpm)"
- myconf+=" $(use_with imagemagick)"
-
- if use xft; then
- myconf+=" --with-xft"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- myconf+=" --without-xft"
- myconf+=" --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
- fi
-
- if use gtk3; then
- einfo "Configuring to build with GIMP Toolkit (GTK+) version 3"
- myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
- elif use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+) version 2"
- myconf+=" --with-x-toolkit=gtk2"
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
-
- local f tk
- for f in gtk3 gtk motif Xaw3d athena; do
- use ${f} || continue
- [[ ${tk} = gtk* || ${tk} = motif ]] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- : ${tk:=${f}}
- done
- ! use gtk3 && use xwidgets && ewarn \
- "USE flag \"xwidgets\" has no effect if \"gtk3\" is not set."
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --localstatedir="${EPREFIX}"/var \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-install \
- --with-file-notification=$(usev gfile || usev inotify || echo no) \
- $(use_enable acl) \
- $(use_with dbus) \
- $(use_with gnutls) \
- $(use_with gpm) \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- $(use_with wide-int) \
- $(use_with zlib) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake
-}
-
-src_install () {
- emake DESTDIR="${D}" NO_BIN_LINK=t install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "moving emacs executable failed"
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
- || die "moving emacs man page failed"
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- # remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
- if use gzip-el; then
- # compress .el files when a corresponding .elc exists
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
- assert "gzip .el failed"
- fi
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README README.xwidget BUGS CONTRIBUTE
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
- strongly recommended that you use app-admin/emacs-updater to rebuild
- all byte-compiled elisp files of the installed Emacs packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
- it into /Applications by yourself."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
-
- local pvr
- for pvr in ${REPLACING_VERSIONS}; do
- [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
- done
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
- # refresh symlinks in case any installed files have changed
- eselect emacs set ${EMACS_SUFFIX}
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml
deleted file mode 100644
index 7e27373..0000000
--- a/app-editors/emacs-xwidget/metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-<longdescription>
- GNU Emacs is an extensible, customizable text editor - and more. At its core
- is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
- with extensions to support text editing. The features of GNU Emacs include:
- * Content-sensitive editing modes, including syntax coloring, for a variety
- of file types including plain text, source code, and HTML.
- * Complete built-in documentation, including a tutorial for new users.
- * Full Unicode support for nearly all human languages and their scripts.
- * Highly customizable, using Emacs Lisp code or a graphical interface.
- * A large number of extensions that add other functionality, including a
- project planner, mail and news reader, debugger interface, calendar, and
- more. Many of these extensions are distributed with GNU Emacs; others are
- available separately.
-</longdescription>
-<use>
- <flag name='athena'>Enable the MIT Athena widget set
- (<pkg>x11-libs/libXaw</pkg>)</flag>
- <flag name='games'>Support shared score files for games</flag>
- <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
- font name</flag>
- <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
- notification</flag>
- <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
- system font name</flag>
- <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
- <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
- <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
- <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
- processing</flag>
- <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
- of the internal Lisp implementations</flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel
- (<pkg>sys-apps/paxctl</pkg>)</flag>
- <flag name='source'>Install C source files and make them available for
- find-function</flag>
- <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
- preference to Emacs' own scrollbars</flag>
- <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
- This option has an effect only on architectures where "long" and
- "long long" types have different size.</flag>
- <flag name='xwidgets'>Enable use of some gtk widgets it Emacs buffers</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-12-29 12:29 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-12-29 12:29 UTC (permalink / raw
To: gentoo-commits
commit: ce7ffa160d114dcc99fc881a608917000daccae6
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 29 12:34:08 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 29 12:34:08 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ce7ffa16
app-editors/emacs-xwidget: Set a fake version number to avoid collisions with emacs-vcs.
Package-Manager: portage-2.2.15
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 28a0a5a..1cec23c 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
+ Set a fake version number to avoid collisions with emacs-vcs.
+
*emacs-xwidget-25.0.9999 (29 Dec 2014)
29 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.4.9999.ebuild,
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
index 0cce171..7ae4df6 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
@@ -104,8 +104,8 @@ EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
- # set a fake version number to avoid collisions between SLOTs
- #sed -i -e "/AC_INIT/s/\(24\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
+ # set a fake version number to avoid collisions with emacs-vcs
+ sed -i -e "/AC_INIT/s/\(25\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-12-29 11:12 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-12-29 11:12 UTC (permalink / raw
To: gentoo-commits
commit: 084eadf93279631a2e48abd88561edd593f388f7
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 29 11:16:56 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 29 11:16:56 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=084eadf9
app-editors/emacs-xwidget: Upstream version number has changed. Merge changes from emacs-vcs.
Package-Manager: portage-2.2.15
---
app-editors/emacs-xwidget/ChangeLog | 6 +++
....9999.ebuild => emacs-xwidget-25.0.9999.ebuild} | 63 +++++++++++-----------
2 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 36dd441..28a0a5a 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*emacs-xwidget-25.0.9999 (29 Dec 2014)
+
+ 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.4.9999.ebuild,
+ +emacs-xwidget-25.0.9999.ebuild:
+ Upstream version number has changed. Merge changes from emacs-vcs.
+
13 Nov 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.4.9999.ebuild:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
similarity index 90%
rename from app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
rename to app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
index 4661889..0cce171 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
@@ -27,8 +27,8 @@ HOMEPAGE="http://www.gnu.org/software/emacs/
http://www.emacswiki.org/emacs/EmacsXembed"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+SLOT="25"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
@@ -68,21 +68,21 @@ RDEPEND="sys-libs/ncurses
>=dev-libs/m17n-lib-1.5.1
)
)
- gtk? (
+ gtk3? (
+ x11-libs/gtk+:3
xwidgets? (
- x11-libs/gtk+:3
+ >=dev-libs/gobject-introspection-1.32.1
net-libs/webkit-gtk:3
)
- !xwidgets? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- )
)
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+ !gtk3? (
+ gtk? ( x11-libs/gtk+:2 )
+ !gtk? (
+ motif? ( >=x11-libs/motif-2.3:0 )
+ !motif? (
+ Xaw3d? ( x11-libs/libXaw3d )
+ !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+ )
)
)
)"
@@ -173,26 +173,15 @@ src_configure() {
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
- local f
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- if use xwidgets; then
- myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
- else
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
- myconf+=" --without-xwidgets"
- fi
- for f in motif Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"gtk\" is set."
- done
+ if use gtk3; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+) version 3"
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+ elif use gtk; then
+ einfo "Configuring to build with GIMP Toolkit (GTK+) version 2"
+ myconf+=" --with-x-toolkit=gtk2"
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf+=" --with-x-toolkit=motif"
- for f in Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"motif\" is set."
- done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
@@ -200,8 +189,16 @@ src_configure() {
einfo "Configuring to build with no toolkit"
myconf+=" --with-x-toolkit=no"
fi
- ! use gtk && use xwidgets && ewarn \
- "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+
+ local f tk
+ for f in gtk3 gtk motif Xaw3d athena; do
+ use ${f} || continue
+ [[ ${tk} = gtk* || ${tk} = motif ]] \
+ && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
+ : ${tk:=${f}}
+ done
+ ! use gtk3 && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk3\" is not set."
elif use aqua; then
einfo "Configuring to build with Nextstep (Cocoa) support"
myconf+=" --with-ns --disable-ns-self-contained"
@@ -306,7 +303,7 @@ src_install () {
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
- dodoc README README.xwidget BUGS
+ dodoc README README.xwidget BUGS CONTRIBUTE
if use aqua; then
dodir /Applications/Gentoo
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-11-13 23:49 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-11-13 23:49 UTC (permalink / raw
To: gentoo-commits
commit: a5a8bcdd3ac2f25035c07a03ae3c3100d362ffb4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 13 23:51:59 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 13 23:51:59 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=a5a8bcdd
app-editors/emacs-xwidget: Merge changes from emacs-vcs.
Package-Manager: portage-2.2.14
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
.../emacs-xwidget/emacs-xwidget-24.4.9999.ebuild | 28 +++++++++++-----------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 6b97421..36dd441 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Nov 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.4.9999.ebuild:
+ Merge changes from emacs-vcs.
+
*emacs-xwidget-24.4.9999 (07 Jun 2014)
07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.3.9999.ebuild,
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
index f1011a6..4661889 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
@@ -7,15 +7,11 @@ EAPI=5
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
if [[ ${PV##*.} = 9999 ]]; then
- EBZR_PROJECT="emacs"
- EBZR_BRANCH="xwidget"
- EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
- # "Nosmart" is much faster for initial branching.
- EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
- EBZR_UNPACK_DIR="${WORKDIR}/emacs"
- EBZR_WORKDIR_CHECKOUT="t" #434746
- inherit bzr
- S="${EBZR_UNPACK_DIR}"
+ inherit git-r3
+ EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
+ EGIT_BRANCH="xwidget"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+ S="${EGIT_CHECKOUT_DIR}"
else
SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
@@ -109,14 +105,14 @@ SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
# set a fake version number to avoid collisions between SLOTs
- sed -i -e "/AC_INIT/s/\(24\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
+ #sed -i -e "/AC_INIT/s/\(24\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.ac)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
- einfo "Emacs branch: ${EBZR_BRANCH}"
- einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
+ einfo "Emacs branch: ${EGIT_BRANCH}"
+ einfo "Commit: ${EGIT_VERSION}"
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
@@ -133,6 +129,7 @@ src_prepare() {
src_configure() {
strip-flags
+ filter-flags -pie #526948
if use sh; then
replace-flags "-O[1-9]" -O0 #262359
@@ -217,7 +214,7 @@ src_configure() {
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
+ myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
fi
econf \
@@ -262,12 +259,15 @@ src_install () {
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons}
rm -rf "${ED}"/var
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ # remove COPYING file (except for etc/COPYING used by describe-copying)
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
if use gzip-el; then
# compress .el files when a corresponding .elc exists
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-06-07 10:24 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-06-07 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 5f3a99b80dfbdd39991a5260727fffd575ffd7a8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 7 09:55:50 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 7 09:55:50 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5f3a99b8
Upstream version number has changed.
Package-Manager: portage-2.2.10
---
app-editors/emacs-xwidget/ChangeLog | 6 ++++++
...s-xwidget-24.3.9999.ebuild => emacs-xwidget-24.4.9999.ebuild} | 9 ++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 6a735d5..6b97421 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*emacs-xwidget-24.4.9999 (07 Jun 2014)
+
+ 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.3.9999.ebuild,
+ +emacs-xwidget-24.4.9999.ebuild:
+ Upstream version number has changed.
+
06 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
similarity index 97%
rename from app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
rename to app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
index 3cc7c9a..f1011a6 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild
@@ -92,12 +92,7 @@ RDEPEND="sys-libs/ncurses
)"
DEPEND="${RDEPEND}
- alsa? ( virtual/pkgconfig )
- dbus? ( virtual/pkgconfig )
- gfile? ( virtual/pkgconfig )
- gnutls? ( virtual/pkgconfig )
- libxml2? ( virtual/pkgconfig )
- X? ( virtual/pkgconfig )
+ virtual/pkgconfig
gzip-el? ( app-arch/gzip )
pax_kernel? (
sys-apps/attr
@@ -117,7 +112,7 @@ src_prepare() {
sed -i -e "/AC_INIT/s/\(24\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac
if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
+ FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
configure.ac)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-05-06 6:01 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-05-06 6:01 UTC (permalink / raw
To: gentoo-commits
commit: 5bbbc0be848989bc7e6d59fe0d9a6c6096b18f66
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue May 6 06:00:46 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue May 6 06:00:46 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5bbbc0be
Merge changes from emacs-vcs.
Package-Manager: portage-2.2.10
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 10 +++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 8cd64a2..6a735d5 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 May 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 40e6eaa..3cc7c9a 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
+ >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
@@ -99,7 +99,10 @@ DEPEND="${RDEPEND}
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
- pax_kernel? ( sys-apps/paxctl )"
+ pax_kernel? (
+ sys-apps/attr
+ sys-apps/paxctl
+ )"
if [[ ${PV##*.} = 9999 ]]; then
DEPEND="${DEPEND}
@@ -225,6 +228,7 @@ src_configure() {
econf \
--program-suffix="-${EMACS_SUFFIX}" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+ --localstatedir="${EPREFIX}"/var \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-install \
@@ -326,7 +330,7 @@ src_install () {
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
for how to enable anti-aliased fonts."
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-03-15 7:26 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-03-15 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 9b769e26cad727078b46efa9404f5b20d60e5fdf
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 07:32:54 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 07:32:54 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=9b769e26
Merge changes from emacs-vcs.
Package-Manager: portage-2.2.8-r1
---
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index ffe8915..40e6eaa 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -365,6 +365,9 @@ pkg_postinst() {
# force an update of the emacs symlink for the livecd/dvd,
# because some microemacs packages set it with USE=livecd
eselect emacs update
+ elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+ # refresh symlinks in case any installed files have changed
+ eselect emacs set ${EMACS_SUFFIX}
else
eselect emacs update ifunset
fi
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-03-13 19:09 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-03-13 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 5cc94ffdd0e49ed048aa5d45ef3a800ff421b664
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 19:13:58 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 19:13:58 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5cc94ffd
Merge changes from emacs-vcs.
Package-Manager: portage-2.2.8-r1
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 8dd1a18..8cd64a2 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Mar 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 5d941ad..ffe8915 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -36,7 +36,7 @@ IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
+ >=app-admin/eselect-emacs-1.16
>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
acl? ( virtual/acl )
@@ -252,6 +252,8 @@ src_install () {
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|| die "moving emacs executable failed"
+ mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
+ || die "moving emacs man page failed"
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-02-19 20:15 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-02-19 20:15 UTC (permalink / raw
To: gentoo-commits
commit: bf69a215ac0e22800a760e7f6796eab6f48b2935
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 20:09:32 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 20:09:32 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=bf69a215
Typo.
---
app-editors/emacs-xwidget/ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index b58459b..0ed4371 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -3,7 +3,7 @@
# $Header: $
19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
- Merge changes from emacs-vcs
+ Merge changes from emacs-vcs.
19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Switch from package.mask to empty KEYWORDS.
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-02-19 20:15 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-02-19 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 801afcd0f8f3d1ff66af97886142abd2c2f43726
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 20:11:37 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 20:11:37 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=801afcd0
Merge changes from emacs-vcs.
Package-Manager: portage-2.2.8-r1
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 0ed4371..8dd1a18 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Feb 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index c15cdd8..5d941ad 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -125,6 +125,11 @@ src_prepare() {
fi
epatch_user
+
+ # Fix filename reference in redirected man page
+ sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+ || die "unable to sed ctags.1"
+
AT_M4DIR=m4 eautoreconf
}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2014-01-19 21:10 Ulrich Müller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Müller @ 2014-01-19 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 2803f0a53cf15e9fd4e35db80fe38904ec83acaa
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 21:14:27 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 21:14:27 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=2803f0a5
Merge changes from emacs-vcs
Package-Manager: portage-2.2.8
---
app-editors/emacs-xwidget/ChangeLog | 3 ++
.../emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 46 ++++++++++------------
2 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 5891a00..b58459b 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -3,6 +3,9 @@
# $Header: $
19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs
+
+ 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Switch from package.mask to empty KEYWORDS.
16 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 37d4842..c15cdd8 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV##*.} = 9999 ]]; then
inherit bzr
S="${EBZR_UNPACK_DIR}"
else
- SRC_URI="mirror://gentoo/emacs-${PV}.tar.xz
+ SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses
@@ -49,6 +49,7 @@ RDEPEND="sys-libs/ncurses
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
x11-libs/libXt
@@ -56,7 +57,7 @@ RDEPEND="sys-libs/ncurses
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg )
+ jpeg? ( virtual/jpeg:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
@@ -124,21 +125,6 @@ src_prepare() {
fi
epatch_user
-
- if ! use alsa; then
- # ALSA is detected even if not requested by its USE flag.
- # Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.ac \
- || die "unable to sed configure.ac"
- fi
- if ! use gzip-el; then
- # Emacs' build system automatically detects the gzip binary and
- # compresses el files. We don't want that so confuse it with a
- # wrong binary name
- sed -i -e "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \
- || die "unable to sed configure.ac"
- fi
-
AT_M4DIR=m4 eautoreconf
}
@@ -155,12 +141,12 @@ src_configure() {
local myconf
- if use alsa && ! use sound; then
- einfo "Although sound USE flag is disabled you chose to have alsa,"
- einfo "so sound is switched on anyway."
- myconf+=" --with-sound"
+ if use alsa; then
+ use sound || ewarn \
+ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+ myconf+=" --with-sound=alsa"
else
- myconf+=" $(use_with sound)"
+ myconf+=" --with-sound=$(usex sound oss)"
fi
if use X; then
@@ -233,11 +219,10 @@ src_configure() {
econf \
--program-suffix="-${EMACS_SUFFIX}" \
- --program-transform-name="s/^\(emacs\)-[0-9].*-\1/\1/" \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-info \
+ --without-compress-install \
--with-file-notification=$(usev gfile || usev inotify || echo no) \
$(use_enable acl) \
$(use_with dbus) \
@@ -248,6 +233,7 @@ src_configure() {
$(use_with libxml2 xml2) \
$(use_with selinux) \
$(use_with wide-int) \
+ $(use_with zlib) \
${myconf}
}
@@ -259,6 +245,9 @@ src_compile() {
src_install () {
emake DESTDIR="${D}" NO_BIN_LINK=t install
+ mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+ || die "moving emacs executable failed"
+
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
@@ -273,6 +262,13 @@ src_install () {
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+ if use gzip-el; then
+ # compress .el files when a corresponding .elc exists
+ find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+ -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+ assert "gzip .el failed"
+ fi
+
local cdir
if use source; then
cdir="/usr/share/emacs/${FULL_VERSION}/src"
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2013-07-16 23:06 Ulrich Mueller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Mueller @ 2013-07-16 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 1748037deac66dc6b2edef2706ba90eb8c584493
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 23:07:14 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 23:07:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=1748037d
Install README.xwidget.
Package-Manager: portage-2.1.12.13
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 73c6eb1..2f7411d 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Install README.xwidget.
+
14 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 7a93bf9..edec392 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -305,7 +305,7 @@ src_install () {
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
- dodoc README BUGS
+ dodoc README README.xwidget BUGS
if use aqua; then
dodir /Applications/Gentoo
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2013-07-14 15:46 Ulrich Mueller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Mueller @ 2013-07-14 15:46 UTC (permalink / raw
To: gentoo-commits
commit: ad6172d5c9393f715657ca71651a7817093e6814
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 15:46:51 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 15:46:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ad6172d5
Merge changes from emacs-vcs.
Package-Manager: portage-2.1.12.13
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 4a98282..73c6eb1 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Jul 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge changes from emacs-vcs.
+
15 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild,
metadata.xml:
Merge changes from emacs-vcs.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 6515c5f..7a93bf9 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -12,9 +12,10 @@ if [[ ${PV##*.} = 9999 ]]; then
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
# "Nosmart" is much faster for initial branching.
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
+ EBZR_UNPACK_DIR="${WORKDIR}/emacs"
EBZR_WORKDIR_CHECKOUT="t" #434746
inherit bzr
- SRC_URI=""
+ S="${EBZR_UNPACK_DIR}"
else
SRC_URI="mirror://gentoo/emacs-${PV}.tar.xz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
@@ -323,7 +324,7 @@ src_install () {
use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
Installing media-fonts/font-adobe-{75,100}dpi on the X server's
machine would satisfy basic Emacs requirements under X11.
- See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml
+ See also https://wiki.gentoo.org/wiki/Project:Emacs/Xft_support
for how to enable anti-aliased fonts."
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/
@ 2013-06-08 21:21 Ulrich Mueller
0 siblings, 0 replies; 19+ messages in thread
From: Ulrich Mueller @ 2013-06-08 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 5d30d1ec6ce5e84764237c83d48cd6ea95668abc
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 21:20:40 2013 +0000
Commit: Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 21:20:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5d30d1ec
Merge some changes from emacs-vcs.
Package-Manager: portage-2.1.12.3
---
app-editors/emacs-xwidget/ChangeLog | 3 +++
.../emacs-xwidget/emacs-xwidget-24.3.9999.ebuild | 23 +++++++++++++---------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 763a505..020e55f 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge some changes from emacs-vcs.
+
31 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 2eb8544..d7c480e 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
+ acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
- acl? ( virtual/acl )
+ gpm? ( sys-libs/gpm )
+ hesiod? ( net-dns/hesiod )
+ kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
@@ -56,7 +56,7 @@ RDEPEND="sys-libs/ncurses
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
- png? ( >=media-libs/libpng-1.4:0 )
+ png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
@@ -98,6 +98,11 @@ DEPEND="${RDEPEND}
gzip-el? ( app-arch/gzip )
pax_kernel? ( sys-apps/paxctl )"
+if [[ ${PV##*.} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ sys-apps/texinfo"
+fi
+
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
@@ -231,13 +236,13 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with gpm) \
+ $(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
+ $(use_with gpm) \
+ $(use_with hesiod) \
$(use_with inotify) \
- $(use_with acl) \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
$(use_with wide-int) \
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2016-01-31 8:26 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-15 16:20 [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-xwidget/ Ulrich Mueller
-- strict thread matches above, loose matches on Subject: below --
2016-01-31 8:26 Ulrich Müller
2015-02-21 23:11 Ulrich Müller
2015-02-01 21:31 Ulrich Müller
2015-02-01 21:31 Ulrich Müller
2015-02-01 15:51 Ulrich Müller
2014-12-29 12:29 Ulrich Müller
2014-12-29 11:12 Ulrich Müller
2014-11-13 23:49 Ulrich Müller
2014-06-07 10:24 Ulrich Müller
2014-05-06 6:01 Ulrich Müller
2014-03-15 7:26 Ulrich Müller
2014-03-13 19:09 Ulrich Müller
2014-02-19 20:15 Ulrich Müller
2014-02-19 20:15 Ulrich Müller
2014-01-19 21:10 Ulrich Müller
2013-07-16 23:06 Ulrich Mueller
2013-07-14 15:46 Ulrich Mueller
2013-06-08 21:21 Ulrich Mueller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox