From 5cfefa090aae070c52f90d1fba524f666f37b523 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sun, 7 Nov 2010 21:11:46 +0000 Subject: Depend on virtual/jpeg wrt bug 327487. Remove intermediate version. Package-Manager: portage-2.1.9.24/cvs/Linux x86_64 --- app-editors/emacs/ChangeLog | 6 +- app-editors/emacs/Manifest | 15 +- app-editors/emacs/emacs-21.4-r22.ebuild | 4 +- app-editors/emacs/emacs-22.3-r6.ebuild | 4 +- app-editors/emacs/emacs-23.2-r2.ebuild | 4 +- app-editors/emacs/emacs-23.2.ebuild | 316 -------------------------------- 6 files changed, 18 insertions(+), 331 deletions(-) delete mode 100644 app-editors/emacs/emacs-23.2.ebuild (limited to 'app-editors') diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 5a77903508b5..253cac4723c2 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.398 2010/11/06 20:11:26 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.399 2010/11/07 21:11:46 ulm Exp $ + + 07 Nov 2010; Ulrich Mueller emacs-21.4-r22.ebuild, + emacs-22.3-r6.ebuild, -emacs-23.2.ebuild, emacs-23.2-r2.ebuild: + Depend on virtual/jpeg wrt bug 327487. Remove intermediate version. 06 Nov 2010; Christian Faulhammer emacs-21.4-r22.ebuild, emacs-22.3-r6.ebuild, emacs-23.2-r2.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 05fe2f04e4e9..eb2dd39275d5 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -15,18 +15,17 @@ DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a EBUILD emacs-21.4-r20.ebuild 5259 RMD160 201202e85ef127240638cd7226110b41d39d53a6 SHA1 1ebc627f50775c04ed11416ca8ffc0702ea44bff SHA256 0313bc2d9f5691c28aa75967fd9ba378b5dabfa1996032cecae3c68937a63d33 -EBUILD emacs-21.4-r22.ebuild 5194 RMD160 6ef46e594476a696a40892604286d891aca4db6f SHA1 ed9e2eab275c15599ff5eb63f0b75e272693576d SHA256 f7b8cc5642123b800b72a4b72041b28235af5ef6e94e66d2b858cff6718af99f +EBUILD emacs-21.4-r22.ebuild 5179 RMD160 1d0e844a322ca7f42212b285ce4151ad6265ae20 SHA1 6ffcad71f2dc306ef3e05a79cf94b1b7b83247be SHA256 b8c0d91c3d256d2b10a17137f1bc05ba6128c58475af3bcd95ac6125a72dc05f EBUILD emacs-22.3-r4.ebuild 7881 RMD160 6ab0399fd2c20b0906aca000e60427f90b9e54e9 SHA1 e73f8069cc4f843586616623b4efe48868c23f00 SHA256 27eca79c4a5adcb30aeb539b38f5cbc0e22e177150b80e70795e55b7d04f41fd -EBUILD emacs-22.3-r6.ebuild 8004 RMD160 2efe9e982ee10c352fdbebab311c408ad446a094 SHA1 cf64cdc05185779ae0fa103dd6887179eead56fb SHA256 78a47b4fe4ca767a232d95ae5215a082b806eaa35a46e1ff112e34103168c481 +EBUILD emacs-22.3-r6.ebuild 7997 RMD160 223676e44bcc6b50070cf7e7538c12979611bad4 SHA1 4abe4c7b96bf0e7584ed7f185be8d2f92ac8b9d9 SHA256 65d5fb05498c219af68863072caadf2fbd79a0d6d9d177e425e32d1b502c6c32 EBUILD emacs-23.1-r3.ebuild 9793 RMD160 c215eec76ea59514a83bc62058a9cd93a055e327 SHA1 c79c66489d225ddf73e7f83c21cadf91018ae36c SHA256 af9a49ce2c96ed67601bd03554ef3faa357f9acd2fa946592bd8fed96fd5b0b9 -EBUILD emacs-23.2-r2.ebuild 9960 RMD160 1126a6909f52f331ee706df8ad0d354cc9216d9c SHA1 1f1e0c71b0960d5a8779e90bfc8fe71239783062 SHA256 1a8d952cdb6614d95c66625bb47b928c2e19cfeb184bd97cf06b8a3c08ed2793 -EBUILD emacs-23.2.ebuild 9905 RMD160 39521fa7f22d3daea1e66a6faad85ad082b1daa6 SHA1 8b73357172b5b3337557655e1670d432b15ccca5 SHA256 3cfde8e37f0b1c1f78bbfeb29b4da6a3b775ea526b2c9a57c5a3d52a0e18a11e -MISC ChangeLog 56475 RMD160 b8203495a5bbaf6aba2c72030f9bf44b0bc33056 SHA1 fb687c1f9dee2235f33bb4da52f1b9011879d308 SHA256 d7f4110b78aa64c2cae5b14a96803abfbf99d4723bf082432ad079b3be070e78 +EBUILD emacs-23.2-r2.ebuild 9953 RMD160 278fcf90ade2205011033d10ad2a72dfbff65356 SHA1 31aa98ee95e5df985179374316379dc25c4195d4 SHA256 66bfb27f7e5805e39bc5e9bd314e3d863264ea53f5f8ae1774d34edd9afb3ee0 +MISC ChangeLog 56682 RMD160 c912410cfaf9182e25eb52a0fc8eeb6ca74716ca SHA1 d5aa877d50e6d2432ab32e46a09fd5f967fe3813 SHA256 5dd472e0c31ffaf74acc279d2a58b2b25af2d754f9d83ca48fa9c016382a3784 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzVtxcACgkQOeoy/oIi7ux9NACgo2FZJYTwaj41/BPvJYvwedp0 -uRgAoKB7MpM18bU6MYBTdPtNHsvq0u7K -=MDUX +iEYEARECAAYFAkzXFr8ACgkQOeoy/oIi7uzeEACeNXc3lvrPtQEKoPgGjOZ+Mr4s +xIQAn0piAyCkGF3/RGJ3252RR45ZTrxx +=15X+ -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-21.4-r22.ebuild b/app-editors/emacs/emacs-21.4-r22.ebuild index 4ba73d326c2f..0cc99948b313 100644 --- a/app-editors/emacs/emacs-21.4-r22.ebuild +++ b/app-editors/emacs/emacs-21.4-r22.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r22.ebuild,v 1.7 2010/11/06 18:00:31 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r22.ebuild,v 1.8 2010/11/07 21:11:46 ulm Exp $ EAPI=2 @@ -27,7 +27,7 @@ DEPEND="sys-libs/ncurses x11-libs/libXpm x11-misc/xbitmaps >=media-libs/giflib-4.1.0.1b - >=media-libs/jpeg-6b-r2:0 + virtual/jpeg >=media-libs/tiff-3.5.5-r3 >=media-libs/libpng-1.2.1 Xaw3d? ( x11-libs/Xaw3d ) diff --git a/app-editors/emacs/emacs-22.3-r6.ebuild b/app-editors/emacs/emacs-22.3-r6.ebuild index cbff47dc70fe..ade5be036c61 100644 --- a/app-editors/emacs/emacs-22.3-r6.ebuild +++ b/app-editors/emacs/emacs-22.3-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r6.ebuild,v 1.7 2010/11/06 19:00:03 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r6.ebuild,v 1.8 2010/11/07 21:11:46 ulm Exp $ EAPI=2 @@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses x11-libs/libXt x11-misc/xbitmaps gif? ( media-libs/giflib ) - jpeg? ( media-libs/jpeg:0 ) + jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) diff --git a/app-editors/emacs/emacs-23.2-r2.ebuild b/app-editors/emacs/emacs-23.2-r2.ebuild index 97ba62050ece..20850267da91 100644 --- a/app-editors/emacs/emacs-23.2-r2.ebuild +++ b/app-editors/emacs/emacs-23.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.7 2010/11/06 19:01:35 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.8 2010/11/07 21:11:46 ulm Exp $ EAPI=2 @@ -45,7 +45,7 @@ RDEPEND="sys-libs/ncurses x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib ) - jpeg? ( media-libs/jpeg:0 ) + jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) diff --git a/app-editors/emacs/emacs-23.2.ebuild b/app-editors/emacs/emacs-23.2.ebuild deleted file mode 100644 index 3691baab8647..000000000000 --- a/app-editors/emacs/emacs-23.2.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2.ebuild,v 1.7 2010/10/11 21:59:11 fauli Exp $ - -EAPI=2 - -inherit autotools elisp-common eutils flag-o-matic multilib - -if [ "${PV##*.}" = "9999" ]; then - inherit bzr - EMACS_BRANCH="emacs-23" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/" - EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" - SRC_URI="" -else - SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 - mirror://gentoo/${P}-patches-1.tar.bz2" - # 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/" - -LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode" -SLOT="23" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png 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 ) - alsa? ( media-libs/alsa-lib ) - gpm? ( sys-libs/gpm ) - dbus? ( sys-apps/dbus ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gif? ( media-libs/giflib ) - jpeg? ( media-libs/jpeg:0 ) - 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 - x11-libs/libXft - 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-2.3:0 ) ) - ) - )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - !=app-emacs/emacs-common-gentoo-1[X?]" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_prepare() { - if [ "${PV##*.}" = "9999" ]; then - FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') - [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" - echo - einfo "Emacs branch: ${EMACS_BRANCH}" - einfo "Emacs version number: ${FULL_VERSION}" - [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ - || die "Upstream version number changed to ${FULL_VERSION}" - echo - else - EPATCH_SUFFIX=patch epatch - fi - - 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_configure() { - ALLOWED_FLAGS="" - strip-flags - #unset LDFLAGS - 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 && ! 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 gconf)" - 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)" - - 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 && ewarn \ - "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/Lucid) 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} \ - --with-crt-dir=/usr/$(get_libdir) \ - ${myconf} || die "econf emacs failed" -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - if [ "${PV##*.}" = "9999" ]; then - emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" - # cleanup, otherwise emacs will be dumped again in src_install - (cd src; emake versionclean) - fi - 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 /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//' >"${T}/${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 (re "\\\\\`/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 || 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 -} - -pkg_postinst() { - local f - for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do - [ -e "${f}" ] || touch "${f}" - done - chown games:games "${ROOT}"/var/lib/games/emacs - - elisp-site-regen - emacs-infodir-rebuild - eselect emacs update ifunset - - if use X; then - echo - elog "You need to install some fonts for Emacs." - elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" - elog "machine would satisfy basic Emacs requirements under X11." - elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml" - elog "for how to enable anti-aliased fonts." - fi - - 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 "Therefore, several Emacs versions can be installed at the same time." - elog "\"man emacs.eselect\" for details." - echo - elog "If you upgrade from a previous major version of Emacs, then it is" - elog "strongly recommended that you use app-admin/emacs-updater to rebuild" - elog "all byte-compiled elisp files of the installed Emacs packages." -} - -pkg_postrm() { - elisp-site-regen - emacs-infodir-rebuild - eselect emacs update ifunset -} -- cgit v1.2.3-65-gdbad