* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-cvs: emacs-cvs-23.0.9999.ebuild ChangeLog emacs-cvs-23.0.60_pre20081226.ebuild
@ 2008-12-26 12:48 Ulrich Mueller (ulm)
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-12-26 12:48 UTC (permalink / raw
To: gentoo-commits
ulm 08/12/26 12:48:30
Modified: emacs-cvs-23.0.9999.ebuild ChangeLog
Added: emacs-cvs-23.0.60_pre20081226.ebuild
Log:
Snapshot with precompiled elisp files.
(Portage version: 2.2_rc19/cvs/Linux 2.6.27-gentoo-r4 i686)
Revision Changes Path
1.16 app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?r1=1.15&r2=1.16
Index: emacs-cvs-23.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- emacs-cvs-23.0.9999.ebuild 29 Nov 2008 12:19:25 -0000 1.15
+++ emacs-cvs-23.0.9999.ebuild 26 Dec 2008 12:48:30 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.15 2008/11/29 12:19:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.16 2008/12/26 12:48:30 ulm Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -20,7 +20,6 @@
LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C"
SLOT="23"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm"
RESTRICT="strip"
1.227 app-editors/emacs-cvs/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.226&r2=1.227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog 17 Dec 2008 09:42:19 -0000 1.226
+++ ChangeLog 26 Dec 2008 12:48:30 -0000 1.227
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/emacs-cvs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.226 2008/12/17 09:42:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.227 2008/12/26 12:48:30 ulm Exp $
+
+*emacs-cvs-23.0.60_pre20081226 (26 Dec 2008)
+
+ 26 Dec 2008; Ulrich Mueller <ulm@gentoo.org>
+ +emacs-cvs-23.0.60_pre20081226.ebuild:
+ Snapshot with precompiled elisp files, to ease testing on embedded archs.
17 Dec 2008; Ulrich Mueller <ulm@gentoo.org>
files/emacs-cvs-freebsd-sparc-1.patch:
1.1 app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild?rev=1.1&content-type=text/plain
Index: emacs-cvs-23.0.60_pre20081226.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild,v 1.1 2008/12/26 12:48:30 ulm Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
inherit autotools elisp-common eutils flag-o-matic
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.gz"
LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C"
SLOT="23"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm"
RESTRICT="strip"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
net-libs/liblockfile
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
spell? ( || ( app-text/ispell app-text/aspell ) )
alsa? ( media-libs/alsa-lib )
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
x11-misc/emacs-desktop
gif? ( media-libs/giflib )
jpeg? ( media-libs/jpeg )
png? ( media-libs/libpng )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
xft? (
media-libs/fontconfig
media-libs/freetype
virtual/xft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? ( =x11-libs/gtk+-2* )
!gtk? (
Xaw3d? ( x11-libs/Xaw3d )
!Xaw3d? ( motif? ( x11-libs/openmotif ) )
)
)"
DEPEND="${RDEPEND}
dev-util/pkgconfig
gzip-el? ( app-arch/gzip )"
# 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%_*}"
EMACS_SUFFIX="emacs-${SLOT}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/${PN}-freebsd-sparc-1.patch"
sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
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.in \
|| die "unable to sed configure.in"
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 "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|| die "unable to sed configure.in"
fi
eautoreconf
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
ALLOWED_FLAGS=""
strip-flags
#unset LDFLAGS
replace-flags -O[3-9] -O2
local myconf
if use alsa && ! use sound; then
echo
einfo "Although sound USE flag is disabled you chose to have alsa,"
einfo "so sound is switched on anyway."
echo
myconf="${myconf} --with-sound"
else
myconf="${myconf} $(use_with sound)"
fi
if use X; then
myconf="${myconf} --with-x"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
myconf="${myconf} $(use_with tiff) $(use_with xpm)"
myconf="${myconf} $(use_with xft freetype) $(use_with xft)"
if use xft; then
myconf="${myconf} $(use_with m17n-lib libotf)"
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
else
myconf="${myconf} --without-libotf --without-m17n-flt"
use m17n-lib && einfo \
"USE flag \"m17n-lib\" has no effect because xft is not set."
fi
# GTK+ is the default toolkit if USE=gtk is chosen with other
# possibilities. Emacs upstream thinks this should be standard
# policy on all distributions
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf="${myconf} --with-x-toolkit=gtk"
elif use Xaw3d; then
einfo "Configuring to build with Xaw3d (Athena) toolkit"
myconf="${myconf} --with-x-toolkit=athena"
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf="${myconf} --with-x-toolkit=motif"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
fi
local f tk=
for f in gtk Xaw3d motif; do
use ${f} || continue
[ "${tk}" ] \
&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
tk="${tk}${tk:+ }${f}"
done
else
myconf="${myconf} --without-x"
fi
myconf="${myconf} $(use_with hesiod)"
myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
myconf="${myconf} $(use_with gpm) $(use_with dbus)"
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir=/usr/share/info/${EMACS_SUFFIX} \
${myconf} || die "econf emacs failed"
#emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
## cleanup, otherwise emacs will be dumped again in src_install
#(cd src; emake versionclean)
emake CC="$(tc-getCC)" || die "emake failed"
}
src_install () {
local i m
emake install DESTDIR="${D}" || die "make install failed"
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|| die "removing duplicate emacs executable failed"
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
# move info documentation to the correct place
for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
mv "${i}" "${i}.info" || die "mv info failed"
done
# move man pages to the correct place
for m in "${D}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
# avoid collision between slots, see bug #169033 e.g.
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${D}"/usr/share/{applications,icons}
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /usr/share/emacs/site-lisp
keepdir /var/lib/games/emacs
local c=";;"
if use source; then
insinto /usr/share/emacs/${FULL_VERSION}/src
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.[ch]
c=""
fi
sed 's/^X//' >"${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X ${c}(setq find-function-C-source-directory
X ${c} "/usr/share/emacs/${FULL_VERSION}/src")
X (let ((path (getenv "INFOPATH"))
X (dir "/usr/share/info/${EMACS_SUFFIX}"))
X (and path
X ;; move Emacs Info dir to beginning of list
X (setq Info-directory-list
X (cons dir (delete dir (split-string path ":" t)))))))
EOF
elisp-site-file-install "${SITEFILE}" || die
dodoc README BUGS || die "dodoc failed"
}
emacs-infodir-rebuild() {
# Depending on the Portage version, the Info dir file is compressed
# or removed. It is only rebuilt by Portage if our directory is in
# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
local infodir=/usr/share/info/${EMACS_SUFFIX} f
[ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${ROOT}"${infodir}/dir{,.*}
for f in "${ROOT}"${infodir}/*.info*; do
[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
done
rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
echo
}
pkg_postinst() {
[ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \
|| cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
local f
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
[ -e "${f}" ] || touch "${f}"
done
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update ifunset
echo
elog "You can set the version to be started by /usr/bin/emacs through"
elog "the Emacs eselect module, which also redirects man and info pages."
elog "You can therefore test emacs-cvs along with the stable release."
elog "\"man emacs.eselect\" for details."
}
pkg_postrm() {
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update ifunset
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-cvs: emacs-cvs-23.0.9999.ebuild ChangeLog emacs-cvs-23.0.60_pre20081226.ebuild
@ 2009-01-04 19:15 Ulrich Mueller (ulm)
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Mueller (ulm) @ 2009-01-04 19:15 UTC (permalink / raw
To: gentoo-commits
ulm 09/01/04 19:15:44
Modified: emacs-cvs-23.0.9999.ebuild ChangeLog
emacs-cvs-23.0.60_pre20081226.ebuild
Log:
Change virtual/xft dependency to x11-libs/libXft.
(Portage version: 2.2_rc20/cvs/Linux 2.6.27-gentoo-r4 i686)
Revision Changes Path
1.18 app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild?r1=1.17&r2=1.18
Index: emacs-cvs-23.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- emacs-cvs-23.0.9999.ebuild 30 Dec 2008 18:52:14 -0000 1.17
+++ emacs-cvs-23.0.9999.ebuild 4 Jan 2009 19:15:44 -0000 1.18
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.17 2008/12/30 18:52:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.18 2009/01/04 19:15:44 ulm Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -46,7 +46,7 @@
xft? (
media-libs/fontconfig
media-libs/freetype
- virtual/xft
+ x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
1.229 app-editors/emacs-cvs/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.229&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.229&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.228&r2=1.229
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- ChangeLog 30 Dec 2008 18:52:14 -0000 1.228
+++ ChangeLog 4 Jan 2009 19:15:44 -0000 1.229
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-cvs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.228 2008/12/30 18:52:14 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.229 2009/01/04 19:15:44 ulm Exp $
+
+ 04 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
+ emacs-cvs-23.0.60_pre20081226.ebuild, emacs-cvs-23.0.9999.ebuild:
+ Change virtual/xft dependency to x11-libs/libXft.
30 Dec 2008; Raúl Porcel <armin76@gentoo.org> emacs-cvs-23.0.9999.ebuild:
Add ~arm/~s390 wrt #238712
1.3 app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild?r1=1.2&r2=1.3
Index: emacs-cvs-23.0.60_pre20081226.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-cvs-23.0.60_pre20081226.ebuild 27 Dec 2008 19:07:27 -0000 1.2
+++ emacs-cvs-23.0.60_pre20081226.ebuild 4 Jan 2009 19:15:44 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild,v 1.2 2008/12/27 19:07:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild,v 1.3 2009/01/04 19:15:44 ulm Exp $
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
@@ -40,7 +40,7 @@
xft? (
media-libs/fontconfig
media-libs/freetype
- virtual/xft
+ x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-04 19:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-04 19:15 [gentoo-commits] gentoo-x86 commit in app-editors/emacs-cvs: emacs-cvs-23.0.9999.ebuild ChangeLog emacs-cvs-23.0.60_pre20081226.ebuild Ulrich Mueller (ulm)
-- strict thread matches above, loose matches on Subject: below --
2008-12-26 12:48 Ulrich Mueller (ulm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox