added new tag ebuild, corrected slot for live ebuild

Package-Manager: portage-2.1.1-r2

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 9d77c25f693166593348b247d28fc103cf78222d..501234016b96dde55d638286f2c9c5899dd331a8 100644 (file)
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.63 2007/01/26 08:42:59 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.64 2007/01/26 15:34:01 opfer Exp $
+
+*emacs-cvs-22.0.93 (26 Jan 2007)
+
+  26 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.0.93.ebuild, emacs-cvs-22.0.9999.ebuild:
+  added new tag ebuild, corrected slot for live ebuild
 
 *emacs-cvs-22.0.9999 (26 Jan 2007)
 *emacs-cvs-22.0.92-r1 (26 Jan 2007)

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index da5d32c790aa389ce62ef84f88d783293fb33227..a3731b6ba2c7218e4e5920d0b169bea8d2d5ce45 100644 (file)
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -45,18 +45,22 @@ EBUILD emacs-cvs-22.0.92.ebuild 5647 RMD160 cd281bde5837fc7e6f9c4d353b48bd768674
 MD5 89d0f35e6c3877a21756432d5db09387 emacs-cvs-22.0.92.ebuild 5647
 RMD160 cd281bde5837fc7e6f9c4d353b48bd7686745831 emacs-cvs-22.0.92.ebuild 5647
 SHA256 ba6813696cc1fb096bb39d9fadaad4c493931a20c26a9b9563533216fac678ab emacs-cvs-22.0.92.ebuild 5647
-EBUILD emacs-cvs-22.0.9999.ebuild 5587 RMD160 b477fb37a522446167e720e213fd2509a745a40d SHA1 e475598cfe1205e3739c0d40526196365ae30b77 SHA256 9c7914cdc352f9ab520c40573296c4a5fbc3c7e97884b387438dee0cf0d8b3c8
-MD5 f0facab4a8bc3d8f8910f11cfd35aaac emacs-cvs-22.0.9999.ebuild 5587
-RMD160 b477fb37a522446167e720e213fd2509a745a40d emacs-cvs-22.0.9999.ebuild 5587
-SHA256 9c7914cdc352f9ab520c40573296c4a5fbc3c7e97884b387438dee0cf0d8b3c8 emacs-cvs-22.0.9999.ebuild 5587
+EBUILD emacs-cvs-22.0.93.ebuild 5593 RMD160 0edd860587977d72228aa39762fc9a32a8d86097 SHA1 139b369d5f95bb4862819f3528413c28f28962b3 SHA256 ed97a34250589fdc14a17cc5ed9399ecbe1b94cbcd9adae6e037130e759db8f4
+MD5 4c68e3c4622262c13e1cc6c36b45aaba emacs-cvs-22.0.93.ebuild 5593
+RMD160 0edd860587977d72228aa39762fc9a32a8d86097 emacs-cvs-22.0.93.ebuild 5593
+SHA256 ed97a34250589fdc14a17cc5ed9399ecbe1b94cbcd9adae6e037130e759db8f4 emacs-cvs-22.0.93.ebuild 5593
+EBUILD emacs-cvs-22.0.9999.ebuild 5578 RMD160 81009f7095f655f12c1654f98f8957ea4dffd57c SHA1 fbae0173d427ad2eb2ab0bae4c1f1d543817db75 SHA256 506cbcd64e0b4dc9b20fa2041fef7a4b29a861c37e89d641722f2ed47ea7f4ec
+MD5 3882bdaa56e46e0a890aad6c5a22ec8a emacs-cvs-22.0.9999.ebuild 5578
+RMD160 81009f7095f655f12c1654f98f8957ea4dffd57c emacs-cvs-22.0.9999.ebuild 5578
+SHA256 506cbcd64e0b4dc9b20fa2041fef7a4b29a861c37e89d641722f2ed47ea7f4ec emacs-cvs-22.0.9999.ebuild 5578
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5949 RMD160 357b51f2fcfcb4b202288061576462c17e5e80fa SHA1 369e0ff81e01023e5eba5ae766c429ebfec70e62 SHA256 1911b98e56882c801d49d64b3a4b20cb5999c49c7ea0da86ae6c47d16f3744b5
 MD5 802cdeaa37487dd1a50bdf23e84d75ad emacs-cvs-23.0.0-r1.ebuild 5949
 RMD160 357b51f2fcfcb4b202288061576462c17e5e80fa emacs-cvs-23.0.0-r1.ebuild 5949
 SHA256 1911b98e56882c801d49d64b3a4b20cb5999c49c7ea0da86ae6c47d16f3744b5 emacs-cvs-23.0.0-r1.ebuild 5949
-MISC ChangeLog 11496 RMD160 a133fad4877c3a787ec3836b31b2fe67e3295e02 SHA1 a0e25d2b5c53269b99cda652ced09bbf56ba7413 SHA256 014dc88f5f008c522c2f096b2efc25508170a8d814e1a9b6683642656c58fc1c
-MD5 ce5f3f60a7b4f3b5a5f5a7c7cd975351 ChangeLog 11496
-RMD160 a133fad4877c3a787ec3836b31b2fe67e3295e02 ChangeLog 11496
-SHA256 014dc88f5f008c522c2f096b2efc25508170a8d814e1a9b6683642656c58fc1c ChangeLog 11496
+MISC ChangeLog 11698 RMD160 2922b4395ed860995441db8cdebd5d6861d272e5 SHA1 41eb9713624f23e2359cd4b7b7ecdcd0ac387d72 SHA256 69edcd5a9d45610152966793bb21a7c643fdb9f07e8446ae9ab2e9f9423e0c82
+MD5 ff2490d770b468e47c00266d48a596d9 ChangeLog 11698
+RMD160 2922b4395ed860995441db8cdebd5d6861d272e5 ChangeLog 11698
+SHA256 69edcd5a9d45610152966793bb21a7c643fdb9f07e8446ae9ab2e9f9423e0c82 ChangeLog 11698
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -70,6 +74,9 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.92-r1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.92-r1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.92-r1 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.93 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.93 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.93 1
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-emacs-cvs-22.0.9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-emacs-cvs-22.0.9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-emacs-cvs-22.0.9999 1
@@ -79,7 +86,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFub73NQqtfCuFneMRAsYYAKCLkIs3TGQfXFEM24f0Vkr6DiPGmwCfR0IK
-W7ZI18jZld1CAaXENSzlwcg=
-=LwZd
+iD8DBQFFuh9YNQqtfCuFneMRAhqYAJwK4LbSJrLb6xXMaGzZOvuJ9NDJ9gCeKkkQ
+GY3sIc12CU3OOfETE11ykC8=
+=YXfD
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.93.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.93.ebuild
new file mode 100644 (file)
index 0000000..d0aae6f
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.93.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.93.ebuild,v 1.1 2007/01/26 15:34:01 opfer Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="EMACS_PRETEST_22_0_93"
+
+inherit elisp-common cvs alternatives flag-o-matic eutils
+
+IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff source gzip-el toolkit-scroll-bars"
+
+S="${WORKDIR}/emacs"
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor."
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs"
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
+
+DEPEND=">=sys-libs/ncurses-5.3
+       spell? ( || ( app-text/ispell app-text/aspell ) )
+       X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+       X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
+               jpeg? ( >=media-libs/jpeg-6b )
+               tiff? ( >=media-libs/tiff-3.5.7 )
+               png? ( >=media-libs/libpng-1.2.5 )
+               gtk? ( =x11-libs/gtk+-2* )
+               !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
+       sys-libs/zlib"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.93"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+       cvs_src_unpack
+       cd ${S};
+       epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+       use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+       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"
+       epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+}
+
+src_compile() {
+       export SANDBOX_ON=0                     # for the unbelievers, see Bug #131505
+       ALLOWED_FLAGS=" "
+       strip-flags
+       unset LDFLAGS
+       replace-flags -O[3-9] -O2
+       sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+       local myconf
+
+       if use X; then
+               myconf="${myconf} --with-x"
+               myconf="${myconf} --with-xpm"
+               myconf="${myconf} $(use_with toolkit-scroll-bars)"
+               myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+               myconf="${myconf} $(use_with gif) $(use_with png)"
+               if use gtk; then
+                       einfo "Configuring to build with GTK support"
+                       myconf="${myconf} --with-x-toolkit=gtk"
+               else
+                       einfo "Configuring to build with lucid toolkit support"
+                       myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)"
+                       myconf="${myconf} --without-gtk"
+                       myconf="${myconf} --with-x-toolkit=lucid"
+               fi
+       else
+               myconf="${myconf} --without-x"
+       fi
+       if use aqua; then
+               einfo "Configuring to build with Carbon Emacs"
+               econf \
+                       --enable-carbon-app=/Applications/Gentoo \
+                       --without-x \
+                       $(use_with jpeg) $(use_with tiff) \
+                       $(use_with gif) $(use_with png) \
+                        || die "econf carbon emacs failed"
+               make bootstrap || die "make carbon emacs bootstrap failed"
+       else
+               econf \
+                       --program-suffix=.emacs-${SLOT} \
+                       --without-carbon \
+                       ${myconf} || die "econf emacs failed"
+               make bootstrap || die "make emacs bootstrap failed"
+       fi
+}
+
+src_install () {
+       make DESTDIR=${D} install || die
+       rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
+       dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
+
+       if use aqua ; then
+               einfo "Installing Carbon Emacs..."
+               dodir /Applications/Gentoo/Emacs.app
+               pushd mac/Emacs.app
+               tar -chf - . | ( cd ${D}/Applications/Gentoo/Emacs.app; tar -xf -)
+               popd
+       fi
+
+       # fix info documentation
+       einfo "Fixing info documentation..."
+       dodir /usr/share/info/emacs-${SLOT}
+       mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
+       for i in ${D}/usr/share/info/*
+       do
+               if [ "${i##*/}" != emacs-${SLOT} ] ; then
+                       mv ${i} ${i/info/info/emacs-${SLOT}}.info
+               fi
+       done
+
+       if has_version 'app-text/aspell' ; then
+               # defaults to aspell if installed
+               elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+       fi
+       insinto /etc/env.d
+       cat >${D}/etc/env.d/50emacs-cvs-${SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${SLOT}
+EOF
+       einfo "Fixing manpages..."
+       for m in  ${D}/usr/share/man/man1/* ; do
+               mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
+       done
+
+       if use source; then
+               insinto /usr/share/emacs/${SLOT}/src
+               # This is not meant to install all the source -- just the
+               # C source you might find via find-function
+               doins src/*.[ch]
+               cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
+EOF
+               elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+       fi
+
+       if ! use gzip-el; then
+               find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
+       fi
+       dodoc BUGS ChangeLog README
+       insinto /usr/share/applications
+       cp ${FILESDIR}/emacs.desktop.in ${DFILE}
+       sed -i -e "s,@PV@,${SLOT},g" ${DFILE}
+       doins ${DFILE}
+}
+
+update-alternatives() {
+       for i in emacs emacsclient etags ctags b2m ebrowse \
+               rcs-checkin grep-changelog ; do
+               alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i.emacs-*"
+       done
+}
+
+pkg_postinst() {
+       use ppc-macos || update-alternatives
+       elisp-site-regen
+       if use X; then
+               while read line; do einfo "${line}"; done<<'EOF'
+
+You need to install some fonts for Emacs.  Under monolithic
+XFree86/Xorg you typically had such fonts installed by default.         With
+modular Xorg, you will have to perform this step yourself.
+
+Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
+Emacs requirements under X11.
+
+EOF
+       fi
+}
+
+pkg_postrm() {
+       use ppc-macos || update-alternatives
+       elisp-site-regen
+}

diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999.ebuild
index 4054922ed49e705d37a3a8894c402d7fb60083e4..78e9cbd2ad8fa299d74418423388ed44632143eb 100644 (file)
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999.ebuild,v 1.1 2007/01/26 08:42:59 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999.ebuild,v 1.2 2007/01/26 15:34:01 opfer Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -13,7 +13,7 @@ IUSE="X Xaw3d aqua gif gtk jpeg png spell tiff source gzip-el toolkit-scroll-bar
 
 S="${WORKDIR}/emacs"
 
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor."
 SRC_URI=""
 HOMEPAGE="http://www.gnu.org/software/emacs"
 
@@ -34,7 +34,7 @@ DEPEND=">=sys-libs/ncurses-5.3
 
 PROVIDE="virtual/emacs virtual/editor"
 
-SLOT="22.0.92"
+SLOT="22.0.93"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 

diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.93
@@ -0,0 +1 @@
+