| 1 |
ulm 07/11/27 16:03:27 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: emacs-cvs-23.0.0_p20070920-r1.ebuild |
| 5 |
emacs-cvs-22.1.50_p20070829-r2.ebuild |
| 6 |
Removed: emacs-cvs-22.1.50_p20070829-r1.ebuild |
| 7 |
emacs-cvs-22.1.50-r1.ebuild |
| 8 |
emacs-cvs-23.0.50.ebuild emacs-cvs-23.0.60.ebuild |
| 9 |
emacs-cvs-23.0.0_p20070920.ebuild |
| 10 |
Log: |
| 11 |
Sync snapshots with app-editors/emacs. |
| 12 |
(Portage version: 2.1.4_rc3) |
| 13 |
|
| 14 |
Revision Changes Path |
| 15 |
1.174 app-editors/emacs-cvs/ChangeLog |
| 16 |
|
| 17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.174&view=markup |
| 18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.174&content-type=text/plain |
| 19 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.173&r2=1.174 |
| 20 |
|
| 21 |
Index: ChangeLog |
| 22 |
=================================================================== |
| 23 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v |
| 24 |
retrieving revision 1.173 |
| 25 |
retrieving revision 1.174 |
| 26 |
diff -u -r1.173 -r1.174 |
| 27 |
--- ChangeLog 27 Nov 2007 14:11:48 -0000 1.173 |
| 28 |
+++ ChangeLog 27 Nov 2007 16:03:26 -0000 1.174 |
| 29 |
@@ -1,6 +1,17 @@ |
| 30 |
# ChangeLog for app-editors/emacs-cvs |
| 31 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 32 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.173 2007/11/27 14:11:48 opfer Exp $ |
| 33 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.174 2007/11/27 16:03:26 ulm Exp $ |
| 34 |
+ |
| 35 |
+*emacs-cvs-23.0.0_p20070920-r1 (27 Nov 2007) |
| 36 |
+*emacs-cvs-22.1.50_p20070829-r2 (27 Nov 2007) |
| 37 |
+ |
| 38 |
+ 27 Nov 2007; Ulrich Mueller <ulm@g.o> |
| 39 |
+ +files/emacs-cvs-format-int.patch, -emacs-cvs-22.1.50-r1.ebuild, |
| 40 |
+ -emacs-cvs-22.1.50_p20070829-r1.ebuild, |
| 41 |
+ +emacs-cvs-22.1.50_p20070829-r2.ebuild, |
| 42 |
+ -emacs-cvs-23.0.0_p20070920.ebuild, +emacs-cvs-23.0.0_p20070920-r1.ebuild, |
| 43 |
+ -emacs-cvs-23.0.50.ebuild, -emacs-cvs-23.0.60.ebuild: |
| 44 |
+ Synchronize CVS snapshots with app-editors/emacs. Remove old. |
| 45 |
|
| 46 |
*emacs-cvs-23.0.60-r1 (27 Nov 2007) |
| 47 |
*emacs-cvs-23.0.50-r1 (27 Nov 2007) |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.1 app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild?rev=1.1&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild?rev=1.1&content-type=text/plain |
| 55 |
|
| 56 |
Index: emacs-cvs-23.0.0_p20070920-r1.ebuild |
| 57 |
=================================================================== |
| 58 |
# Copyright 1999-2007 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920-r1.ebuild,v 1.1 2007/11/27 16:03:26 ulm Exp $ |
| 61 |
|
| 62 |
WANT_AUTOCONF="2.5" |
| 63 |
WANT_AUTOMAKE="latest" |
| 64 |
|
| 65 |
inherit autotools elisp-common eutils flag-o-matic |
| 66 |
|
| 67 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 68 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
| 69 |
SRC_URI="mirror://gentoo/${P}.tar.bz2" |
| 70 |
|
| 71 |
LICENSE="GPL-3 FDL-1.2 BSD" |
| 72 |
SLOT="23-unicode" |
| 73 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 74 |
IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm" |
| 75 |
RESTRICT="strip" |
| 76 |
|
| 77 |
X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" |
| 78 |
|
| 79 |
RDEPEND="sys-libs/ncurses |
| 80 |
>=app-admin/eselect-emacs-0.7-r1 |
| 81 |
sys-libs/zlib |
| 82 |
hesiod? ( net-dns/hesiod ) |
| 83 |
kerberos? ( virtual/krb5 ) |
| 84 |
spell? ( || ( app-text/ispell app-text/aspell ) ) |
| 85 |
alsa? ( media-libs/alsa-lib ) |
| 86 |
gpm? ( sys-libs/gpm ) |
| 87 |
X? ( |
| 88 |
$X_DEPEND |
| 89 |
x11-misc/emacs-desktop |
| 90 |
gif? ( media-libs/giflib ) |
| 91 |
jpeg? ( media-libs/jpeg ) |
| 92 |
tiff? ( media-libs/tiff ) |
| 93 |
png? ( media-libs/libpng ) |
| 94 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 95 |
xpm? ( x11-libs/libXpm ) |
| 96 |
xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) |
| 97 |
gtk? ( =x11-libs/gtk+-2* ) |
| 98 |
!gtk? ( |
| 99 |
Xaw3d? ( x11-libs/Xaw3d ) |
| 100 |
!Xaw3d? ( |
| 101 |
motif? ( virtual/motif ) |
| 102 |
) |
| 103 |
) |
| 104 |
)" |
| 105 |
|
| 106 |
DEPEND="${RDEPEND} |
| 107 |
gzip-el? ( app-arch/gzip )" |
| 108 |
|
| 109 |
# FULL_VERSION keeps the full version number, which is needed in order to |
| 110 |
# determine some path information correctly for copy/move operations later on |
| 111 |
FULL_VERSION="${PV%%_*}" |
| 112 |
EMACS_SUFFIX="emacs-${SLOT}" |
| 113 |
|
| 114 |
src_unpack() { |
| 115 |
unpack ${A} |
| 116 |
cd "${S}" |
| 117 |
|
| 118 |
sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ |
| 119 |
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ |
| 120 |
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" |
| 121 |
if ! use gzip-el; then |
| 122 |
# Emacs' build system automatically detects the gzip binary and |
| 123 |
# compresses el files. We don't want that so confuse it with a |
| 124 |
# wrong binary name |
| 125 |
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ |
| 126 |
|| die "unable to sed configure.in" |
| 127 |
fi |
| 128 |
|
| 129 |
epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" |
| 130 |
epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" |
| 131 |
epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch" |
| 132 |
epatch "${FILESDIR}/${PN}-no-x-compile.patch" |
| 133 |
epatch "${FILESDIR}/${PN}-hack-local-variables.patch" |
| 134 |
epatch "${FILESDIR}/${PN}-format-int.patch" |
| 135 |
# ALSA is detected and used even if not requested by the USE=alsa flag. |
| 136 |
# So remove the automagic check |
| 137 |
use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch" |
| 138 |
|
| 139 |
eautoreconf |
| 140 |
} |
| 141 |
|
| 142 |
src_compile() { |
| 143 |
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
| 144 |
ALLOWED_FLAGS="" |
| 145 |
strip-flags |
| 146 |
unset LDFLAGS |
| 147 |
replace-flags -O[3-9] -O2 |
| 148 |
|
| 149 |
local myconf |
| 150 |
|
| 151 |
if use alsa && ! use sound; then |
| 152 |
echo |
| 153 |
einfo "Although sound USE flag is disabled you chose to have alsa," |
| 154 |
einfo "so sound is switched on anyway." |
| 155 |
echo |
| 156 |
myconf="${myconf} --with-sound" |
| 157 |
else |
| 158 |
myconf="${myconf} $(use_with sound)" |
| 159 |
fi |
| 160 |
|
| 161 |
if use X; then |
| 162 |
myconf="${myconf} --with-x" |
| 163 |
myconf="${myconf} $(use_with toolkit-scroll-bars)" |
| 164 |
myconf="${myconf} $(use_enable xft font-backend)" |
| 165 |
myconf="${myconf} $(use_with xft freetype)" |
| 166 |
myconf="${myconf} $(use_with xft)" |
| 167 |
myconf="${myconf} $(use_with jpeg) $(use_with tiff)" |
| 168 |
myconf="${myconf} $(use_with gif) $(use_with png)" |
| 169 |
myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)" |
| 170 |
|
| 171 |
# GTK+ is the default toolkit if USE=gtk is chosen with other |
| 172 |
# possibilities. Emacs upstream thinks this should be standard |
| 173 |
# policy on all distributions |
| 174 |
if use gtk; then |
| 175 |
echo |
| 176 |
einfo "Configuring to build with GTK support, disabling all other toolkits" |
| 177 |
echo |
| 178 |
myconf="${myconf} --with-x-toolkit=gtk" |
| 179 |
elif use Xaw3d; then |
| 180 |
einfo "Configuring to build with Xaw3d(athena) support" |
| 181 |
myconf="${myconf} --with-x-toolkit=athena" |
| 182 |
myconf="${myconf} --without-gtk" |
| 183 |
elif use motif; then |
| 184 |
einfo "Configuring to build with motif toolkit support" |
| 185 |
myconf="${myconf} --with-x-toolkit=motif" |
| 186 |
myconf="${myconf} --without-gtk" |
| 187 |
else |
| 188 |
einfo "Configuring to build with no toolkit" |
| 189 |
myconf="${myconf} --with-x-toolkit=no" |
| 190 |
myconf="${myconf} --without-gtk" |
| 191 |
fi |
| 192 |
else |
| 193 |
myconf="${myconf} --without-x" |
| 194 |
fi |
| 195 |
|
| 196 |
myconf="${myconf} $(use_with hesiod)" |
| 197 |
myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" |
| 198 |
myconf="${myconf} $(use_with gpm)" |
| 199 |
|
| 200 |
econf \ |
| 201 |
--program-suffix=-${EMACS_SUFFIX} \ |
| 202 |
--infodir=/usr/share/info/${EMACS_SUFFIX} \ |
| 203 |
--without-carbon \ |
| 204 |
${myconf} || die "econf emacs failed" |
| 205 |
|
| 206 |
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" |
| 207 |
} |
| 208 |
|
| 209 |
src_install () { |
| 210 |
emake install DESTDIR="${D}" || die "make install failed" |
| 211 |
|
| 212 |
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ |
| 213 |
|| die "removing duplicate emacs executable failed" |
| 214 |
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ |
| 215 |
|| die "moving Emacs executable failed" |
| 216 |
|
| 217 |
# move info documentation to the correct place |
| 218 |
einfo "Fixing info documentation ..." |
| 219 |
for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do |
| 220 |
mv ${i} ${i}.info || die "mv info failed" |
| 221 |
done |
| 222 |
|
| 223 |
# move man pages to the correct place |
| 224 |
einfo "Fixing manpages ..." |
| 225 |
for m in "${D}"/usr/share/man/man1/* ; do |
| 226 |
mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed" |
| 227 |
done |
| 228 |
|
| 229 |
# avoid collision between slots, see bug #169033 e.g. |
| 230 |
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el |
| 231 |
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores |
| 232 |
keepdir /var/lib/games/emacs/ |
| 233 |
|
| 234 |
if use source; then |
| 235 |
insinto /usr/share/emacs/${FULL_VERSION}/src |
| 236 |
# This is not meant to install all the source -- just the |
| 237 |
# C source you might find via find-function |
| 238 |
doins src/*.[ch] |
| 239 |
sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF |
| 240 |
|
| 241 |
;;; ${PN}-${SLOT} site-lisp configuration |
| 242 |
|
| 243 |
(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
| 244 |
X (setq find-function-C-source-directory |
| 245 |
X "/usr/share/emacs/${FULL_VERSION}/src")) |
| 246 |
EOF |
| 247 |
elisp-site-file-install 00${PN}-${SLOT}-gentoo.el |
| 248 |
fi |
| 249 |
|
| 250 |
dodoc AUTHORS BUGS CONTRIBUTE README README.unicode || die "dodoc failed" |
| 251 |
} |
| 252 |
|
| 253 |
emacs-infodir-rebuild() { |
| 254 |
# Depending on the Portage version, the Info dir file is compressed |
| 255 |
# or removed. It is only rebuilt by Portage if our directory is in |
| 256 |
# INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
| 257 |
|
| 258 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 259 |
einfo "Regenerating Info directory index in ${infodir} ..." |
| 260 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
| 261 |
for f in "${ROOT}"${infodir}/*.info*; do |
| 262 |
[[ ${f##*/} == *[0-9].info* ]] \ |
| 263 |
|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null |
| 264 |
done |
| 265 |
echo |
| 266 |
} |
| 267 |
|
| 268 |
pkg_postinst() { |
| 269 |
test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || |
| 270 |
cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el |
| 271 |
|
| 272 |
local f |
| 273 |
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do |
| 274 |
test -e ${f} || touch ${f} |
| 275 |
done |
| 276 |
|
| 277 |
elisp-site-regen |
| 278 |
emacs-infodir-rebuild |
| 279 |
eselect emacs update --if-unset |
| 280 |
|
| 281 |
if use X; then |
| 282 |
elog "You need to install some fonts for Emacs. Under monolithic" |
| 283 |
elog "XFree86/Xorg you typically had such fonts installed by default." |
| 284 |
elog "With modular Xorg, you will have to perform this step yourself." |
| 285 |
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" |
| 286 |
elog "machine would satisfy basic Emacs requirements under X11." |
| 287 |
fi |
| 288 |
|
| 289 |
echo |
| 290 |
elog "You can set the version to be started by /usr/bin/emacs through" |
| 291 |
elog "the Emacs eselect module, which also redirects man and info pages." |
| 292 |
elog "You can therefore test emacs-cvs along with the stable release." |
| 293 |
elog "\"man emacs.eselect\" for details." |
| 294 |
} |
| 295 |
|
| 296 |
pkg_postrm() { |
| 297 |
elisp-site-regen |
| 298 |
emacs-infodir-rebuild |
| 299 |
eselect emacs update --if-unset |
| 300 |
} |
| 301 |
|
| 302 |
|
| 303 |
|
| 304 |
1.1 app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild |
| 305 |
|
| 306 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild?rev=1.1&view=markup |
| 307 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild?rev=1.1&content-type=text/plain |
| 308 |
|
| 309 |
Index: emacs-cvs-22.1.50_p20070829-r2.ebuild |
| 310 |
=================================================================== |
| 311 |
# Copyright 1999-2007 Gentoo Foundation |
| 312 |
# Distributed under the terms of the GNU General Public License v2 |
| 313 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50_p20070829-r2.ebuild,v 1.1 2007/11/27 16:03:26 ulm Exp $ |
| 314 |
|
| 315 |
WANT_AUTOCONF="2.5" |
| 316 |
WANT_AUTOMAKE="latest" |
| 317 |
|
| 318 |
inherit autotools elisp-common eutils flag-o-matic |
| 319 |
|
| 320 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 321 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
| 322 |
SRC_URI="mirror://gentoo/${P}.tar.bz2" |
| 323 |
|
| 324 |
LICENSE="GPL-3 FDL-1.2 BSD" |
| 325 |
SLOT="22" |
| 326 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
| 327 |
IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xpm" |
| 328 |
RESTRICT="strip" |
| 329 |
|
| 330 |
X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" |
| 331 |
|
| 332 |
RDEPEND="sys-libs/ncurses |
| 333 |
>=app-admin/eselect-emacs-0.7-r1 |
| 334 |
sys-libs/zlib |
| 335 |
hesiod? ( net-dns/hesiod ) |
| 336 |
kerberos? ( virtual/krb5 ) |
| 337 |
spell? ( || ( app-text/ispell app-text/aspell ) ) |
| 338 |
alsa? ( media-libs/alsa-lib ) |
| 339 |
gpm? ( sys-libs/gpm ) |
| 340 |
X? ( |
| 341 |
$X_DEPEND |
| 342 |
x11-misc/emacs-desktop |
| 343 |
gif? ( media-libs/giflib ) |
| 344 |
jpeg? ( media-libs/jpeg ) |
| 345 |
tiff? ( media-libs/tiff ) |
| 346 |
png? ( media-libs/libpng ) |
| 347 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 348 |
xpm? ( x11-libs/libXpm ) |
| 349 |
gtk? ( =x11-libs/gtk+-2* ) |
| 350 |
!gtk? ( |
| 351 |
Xaw3d? ( x11-libs/Xaw3d ) |
| 352 |
!Xaw3d? ( |
| 353 |
motif? ( virtual/motif ) |
| 354 |
) |
| 355 |
) |
| 356 |
)" |
| 357 |
|
| 358 |
DEPEND="${RDEPEND} |
| 359 |
gzip-el? ( app-arch/gzip )" |
| 360 |
|
| 361 |
# FULL_VERSION keeps the full version number, which is needed in order to |
| 362 |
# determine some path information correctly for copy/move operations later on |
| 363 |
FULL_VERSION="${PV%%_*}" |
| 364 |
EMACS_SUFFIX="emacs-${SLOT}-cvs" |
| 365 |
|
| 366 |
src_unpack() { |
| 367 |
unpack ${A} |
| 368 |
cd "${S}" |
| 369 |
|
| 370 |
sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ |
| 371 |
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \ |
| 372 |
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" |
| 373 |
if ! use gzip-el; then |
| 374 |
# Emacs' build system automatically detects the gzip binary and |
| 375 |
# compresses el files. We don't want that so confuse it with a |
| 376 |
# wrong binary name |
| 377 |
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ |
| 378 |
|| die "unable to sed configure.in" |
| 379 |
fi |
| 380 |
|
| 381 |
epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" |
| 382 |
epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" |
| 383 |
epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch" |
| 384 |
epatch "${FILESDIR}/${PN}-hack-local-variables.patch" |
| 385 |
epatch "${FILESDIR}/${PN}-format-int.patch" |
| 386 |
# ALSA is detected and used even if not requested by the USE=alsa flag. |
| 387 |
# So remove the automagic check |
| 388 |
use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch" |
| 389 |
|
| 390 |
eautoreconf |
| 391 |
} |
| 392 |
|
| 393 |
src_compile() { |
| 394 |
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
| 395 |
ALLOWED_FLAGS="" |
| 396 |
strip-flags |
| 397 |
unset LDFLAGS |
| 398 |
replace-flags -O[3-9] -O2 |
| 399 |
|
| 400 |
local myconf |
| 401 |
|
| 402 |
if use alsa && ! use sound; then |
| 403 |
echo |
| 404 |
einfo "Although sound USE flag is disabled you chose to have alsa," |
| 405 |
einfo "so sound is switched on anyway." |
| 406 |
echo |
| 407 |
myconf="${myconf} --with-sound" |
| 408 |
else |
| 409 |
myconf="${myconf} $(use_with sound)" |
| 410 |
fi |
| 411 |
|
| 412 |
if use X; then |
| 413 |
myconf="${myconf} --with-x" |
| 414 |
myconf="${myconf} $(use_with toolkit-scroll-bars)" |
| 415 |
myconf="${myconf} $(use_with jpeg) $(use_with tiff)" |
| 416 |
myconf="${myconf} $(use_with gif) $(use_with png)" |
| 417 |
myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)" |
| 418 |
|
| 419 |
# GTK+ is the default toolkit if USE=gtk is chosen with other |
| 420 |
# possibilities. Emacs upstream thinks this should be standard |
| 421 |
# policy on all distributions |
| 422 |
if use gtk; then |
| 423 |
echo |
| 424 |
einfo "Configuring to build with GTK support, disabling all other toolkits" |
| 425 |
echo |
| 426 |
myconf="${myconf} --with-x-toolkit=gtk" |
| 427 |
elif use Xaw3d; then |
| 428 |
einfo "Configuring to build with Xaw3d(athena) support" |
| 429 |
myconf="${myconf} --with-x-toolkit=athena" |
| 430 |
myconf="${myconf} --without-gtk" |
| 431 |
elif use motif; then |
| 432 |
einfo "Configuring to build with motif toolkit support" |
| 433 |
myconf="${myconf} --with-x-toolkit=motif" |
| 434 |
myconf="${myconf} --without-gtk" |
| 435 |
else |
| 436 |
einfo "Configuring to build with no toolkit" |
| 437 |
myconf="${myconf} --with-x-toolkit=no" |
| 438 |
myconf="${myconf} --without-gtk" |
| 439 |
fi |
| 440 |
else |
| 441 |
myconf="${myconf} --without-x" |
| 442 |
fi |
| 443 |
|
| 444 |
myconf="${myconf} $(use_with hesiod)" |
| 445 |
myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" |
| 446 |
myconf="${myconf} $(use_with gpm)" |
| 447 |
|
| 448 |
econf \ |
| 449 |
--program-suffix=-${EMACS_SUFFIX} \ |
| 450 |
--infodir=/usr/share/info/${EMACS_SUFFIX} \ |
| 451 |
--without-carbon \ |
| 452 |
${myconf} || die "econf emacs failed" |
| 453 |
|
| 454 |
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" |
| 455 |
} |
| 456 |
|
| 457 |
src_install () { |
| 458 |
emake install DESTDIR="${D}" || die "make install failed" |
| 459 |
|
| 460 |
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ |
| 461 |
|| die "removing duplicate emacs executable failed" |
| 462 |
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ |
| 463 |
|| die "moving Emacs executable failed" |
| 464 |
|
| 465 |
# move info documentation to the correct place |
| 466 |
einfo "Fixing info documentation ..." |
| 467 |
for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do |
| 468 |
mv ${i} ${i}.info || die "mv info failed" |
| 469 |
done |
| 470 |
|
| 471 |
# move man pages to the correct place |
| 472 |
einfo "Fixing manpages ..." |
| 473 |
for m in "${D}"/usr/share/man/man1/* ; do |
| 474 |
mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed" |
| 475 |
done |
| 476 |
|
| 477 |
# avoid collision between slots, see bug #169033 e.g. |
| 478 |
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el |
| 479 |
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores |
| 480 |
keepdir /var/lib/games/emacs/ |
| 481 |
|
| 482 |
if use source; then |
| 483 |
insinto /usr/share/emacs/${FULL_VERSION}/src |
| 484 |
# This is not meant to install all the source -- just the |
| 485 |
# C source you might find via find-function |
| 486 |
doins src/*.[ch] |
| 487 |
sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF |
| 488 |
|
| 489 |
;;; ${PN}-${SLOT} site-lisp configuration |
| 490 |
|
| 491 |
(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
| 492 |
X (setq find-function-C-source-directory |
| 493 |
X "/usr/share/emacs/${FULL_VERSION}/src")) |
| 494 |
EOF |
| 495 |
elisp-site-file-install 00${PN}-${SLOT}-gentoo.el |
| 496 |
fi |
| 497 |
|
| 498 |
dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed" |
| 499 |
} |
| 500 |
|
| 501 |
emacs-infodir-rebuild() { |
| 502 |
# Depending on the Portage version, the Info dir file is compressed |
| 503 |
# or removed. It is only rebuilt by Portage if our directory is in |
| 504 |
# INFOPATH, which is not guaranteed. So we rebuild it ourselves. |
| 505 |
|
| 506 |
local infodir=/usr/share/info/${EMACS_SUFFIX} f |
| 507 |
einfo "Regenerating Info directory index in ${infodir} ..." |
| 508 |
rm -f "${ROOT}"${infodir}/dir{,.*} |
| 509 |
for f in "${ROOT}"${infodir}/*.info*; do |
| 510 |
[[ ${f##*/} == *[0-9].info* ]] \ |
| 511 |
|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null |
| 512 |
done |
| 513 |
echo |
| 514 |
} |
| 515 |
|
| 516 |
pkg_postinst() { |
| 517 |
test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el || |
| 518 |
cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el |
| 519 |
|
| 520 |
local f |
| 521 |
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do |
| 522 |
test -e ${f} || touch ${f} |
| 523 |
done |
| 524 |
|
| 525 |
elisp-site-regen |
| 526 |
emacs-infodir-rebuild |
| 527 |
eselect emacs update --if-unset |
| 528 |
|
| 529 |
if use X; then |
| 530 |
elog "You need to install some fonts for Emacs. Under monolithic" |
| 531 |
elog "XFree86/Xorg you typically had such fonts installed by default." |
| 532 |
elog "With modular Xorg, you will have to perform this step yourself." |
| 533 |
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" |
| 534 |
elog "machine would satisfy basic Emacs requirements under X11." |
| 535 |
fi |
| 536 |
|
| 537 |
echo |
| 538 |
elog "You can set the version to be started by /usr/bin/emacs through" |
| 539 |
elog "the Emacs eselect module, which also redirects man and info pages." |
| 540 |
elog "You can therefore test emacs-cvs along with the stable release." |
| 541 |
elog "\"man emacs.eselect\" for details." |
| 542 |
} |
| 543 |
|
| 544 |
pkg_postrm() { |
| 545 |
elisp-site-regen |
| 546 |
emacs-infodir-rebuild |
| 547 |
eselect emacs update --if-unset |
| 548 |
} |
| 549 |
|
| 550 |
|
| 551 |
|
| 552 |
-- |
| 553 |
gentoo-commits@g.o mailing list |
Archives