Don't install spurious COPYING files. Remove previous snapshot.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 32 insertions, 384 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index e5667b545568..fa9b2d6dcc92 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.173 2014/11/10 09:29:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.174 2014/11/10 18:09:48 ulm Exp $
+
+  10 Nov 2014; Ulrich Müller <ulm@gentoo.org>
+  -emacs-vcs-24.4.50_pre20140929.ebuild, emacs-vcs-24.4.9999-r1.ebuild,
+  emacs-vcs-25.0.50_pre20141031.ebuild, emacs-vcs-25.0.9999.ebuild:
+  Don't install spurious COPYING files. Remove previous snapshot.
 
 *emacs-vcs-25.0.50_pre20141031 (10 Nov 2014)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 4a57407edbd2..0cbb8b14a5e9 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST emacs-24.4.50_pre20140929.tar.xz 24341884 SHA256 06a32322c49390e9859f3743e4c0c348c1206d7dc5c33bd3d5248bc642a533df SHA512 7063eaa5e10006c967b7969624bc024ab22c6ac7583ecb631333fe973381325deecca5d3585fd61b55580198bebb900d477c2071f7016f393aa56fcb10b0b9b0 WHIRLPOOL 21eb7d5059aa631055416b6c4971700489653902e29fd0032510ad13b2279dcd6c9f42978101cd4d522baa7eb6014b4308be4a2f6de2f90a12858c467a3b9b2f
 DIST emacs-25.0.50_pre20141031.tar.xz 24539480 SHA256 ff6af35edc35441465e4b41893573ff72cb85218ebe1c02b211286c72aefe645 SHA512 2abbde5906be73f2b4ca0375a9f138a08c671cbdfecb96e92f4b606ac05177dfbc7afe9409f0b6774497800eb4efe1a461c9c6d64f2a2494a8b27aa0b26e1c44 WHIRLPOOL ac12e7f4577d0b1f42fbe46a333ab0d67eddaf1ab5e723ab9fc3f7c305db453f77fdb4e5919049fe297f3bf2e273b35627c88d8e447d2b335f52ae6fa15ace39
-EBUILD emacs-vcs-24.4.50_pre20140929.ebuild 11505 SHA256 2b6c3353b00db3c61b12d8436b09957eaf1a6ec4d1c95d54ad718109e81defa0 SHA512 dced65db26d57b95fd45f7b7499407a97b65d11564ce0eea02d677d1cb2111ea3986eaf6570bb9b2d86c7d111242fe3ae68760a8f1192d3abb39e174c50d633c WHIRLPOOL 3a2d0e15dd31401ea7de8926962a4d0b9aab093e57ece6854bd01bbdd15b790345d343726e9ec1e2825b1481b22c53dd5894be9462132c3b322aea445db060cb
-EBUILD emacs-vcs-24.4.9999-r1.ebuild 11501 SHA256 65e9d103c42f2756e69e86bea36fce740730ca11ee3023b13f6613ea56b5c7b3 SHA512 e6cfd6aaedc0791223ec3d42cc2beb2c87550d8afdbe6f18715212909d5bea2c66a2373dc94d2586d6e5c4d37714f0d1e28bc0e80e85253d4770ff1878839b35 WHIRLPOOL 91aee63fc386ed4524726c2148a50d13186f47f6c8f9ce59717078d07cf73fb85c963a07c75facfff23968d445fe53285565fcc50a179b4fd7c1b0f8647f0f27
-EBUILD emacs-vcs-25.0.50_pre20141031.ebuild 11505 SHA256 5842adc81a8ab2e663be752eabf69454bd4e2a72afe24bc0dafb4bc13104d8d3 SHA512 15fc98d056715dc41727570009308278b9646888f128d13beab632c4f45006254bacc0c04ad98a6d4a79f8a2a1e04bfeb32e5f1c8331d851dd61722f95e3f2cc WHIRLPOOL 2f08b803eafc2944a57c8c612cee26ce8c7dbbd724039b8350196c7557c430b04a095d464ce5460c4ff89ce017aa786a07308eb122c0e96d642bde08f2aca23c
-EBUILD emacs-vcs-25.0.9999.ebuild 11495 SHA256 ae64e92e447cb56c583ac14ba6fc97f3ef2e294a9685c2f09b6f9d80bd1f8884 SHA512 ecba137f83468a9cfcdac64192ede2005439dbdff652ccb7665e9d4d3656476eae410848ee40e95b2a28e35181ee7ad0f15b7b1086aac2dd0273a8662e706489 WHIRLPOOL 0613b717422395e5dc1bc096aefaa0645a6e4a058753898f9fc12b9ea1950faf9dc70842fb1b1f1a76fbfef2bb8181d8c964463b69da48553c3f71c6f6068488
-MISC ChangeLog 80936 SHA256 1b45346754087e6dca0874d047ccd51b56c0aa442c0ad9e68c8ba3fc801fc62c SHA512 abd2f3e1ef2f92710a1b8d3f26c8e88be6907a6551b227acbf8ff0187d398c01d94ae42c34f0f78bf59a983961216d1f2814999ec02e1b9c4069759a85c529e4 WHIRLPOOL 49b0d396a4fb0ff13694f263c1ec33df9aa5f1db2c414a24fe0568a87c0f107ac0780cd7a9e5a0c63c9963297bfb47a1305da16b39d6148e163d51e050b8e847
+EBUILD emacs-vcs-24.4.9999-r1.ebuild 11632 SHA256 d8d079db36efb24def4c020ef86a1a345820d197697a51d983e64700d827d9fe SHA512 a5603c1c3085f6e02455a4fd4e1931bbca8c7443eae873fbf5e82e1b1419db27308bbaeade47f37266f795f3bc4e41ad36001df3a48f072c89f730f1de7a092e WHIRLPOOL 3417cdd1a8ea2a545b989564e780666516ee4c1a63f02033d10b4dc922161986fe2a57b85005a7d4d351f6153a88c96ef64ad2a79ad3efb291393ac49aaecf29
+EBUILD emacs-vcs-25.0.50_pre20141031.ebuild 11636 SHA256 dd43a7095fdfbc3a63fc7bf7d481901f1ca4040f52eeb9f8a21b02a993959369 SHA512 e06c06284c11ff9b40e2c37dcbde020737e3d2d7fd7d12985ca306baf32e25e3d8cbfba97ea8ffbba2ef4d10c156095ab4a5dd5af42bf1a43a50e08159732634 WHIRLPOOL c3ec5a8ca084fd524b91fcadb5962a46968632ca0a885454704dcb7f0d2e4d5da0277851e7c3715606346b947994b6f8cf73ac36abcdc4f4370bcb01a41783ee
+EBUILD emacs-vcs-25.0.9999.ebuild 11626 SHA256 894ce78d304cc2e77c0aa4dbbf4a56e0cb993d6f407cff335ae085340beed4f0 SHA512 8f2cf672bb38e571adf6bf008ccd4f30fa911c304d131467ddd82cbabc5ed9d023d40d01a18c089d94dbbd5e06873da1e830b96859cd5ec2a6dfd3f372765756 WHIRLPOOL a604fd7900bbae23e3da85d03178506a5eaae2e04bc4976ad2645327ec9c97e98c4f1fcdb48afb20de1d423e0aaae957118addb4f42404546cb57f9a3b4b7b62
+MISC ChangeLog 81190 SHA256 7ecb055827af04025d51461566cbd18779366487b666028dd65259b3f5ae311d SHA512 c41d7d7ef7eb2426885b9711b302bb94d07e438870a5b4a22bd56b676fef1f2fe0995d74c6a71d55f1213fcfefdb1667f9d9c05e68c153312bf4bcf98dde675f WHIRLPOOL 1823be5b371e6741c620ff6cac1e9e24e0688f749203359a4bdced467c7d3c902c9a967afab4d3f67b0776f05c1b833ad986ddfa4e5fd8cbcb62364cb3b8d683
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJUYIZBAAoJEJQzkH1pP7W4pAcL/2FkJnfoyS/K3LzJuHmSnvAm
-b7uhgb+eNnSzJyL9yBiWBdrc+CCWOqdo1Ozqk1hvbiRdZ+b8dNgUyHDYQjvOGrrM
-gEleISE201hit0o8qG0iske81YGjQsygpcLy9lQHZJOzZyca1lS/eXcNdmXuZ9RY
-15IWubSisq7NkNDaEBGJBSx2XCqSqqrHPqeta5uqTVtJ3tQci0lEVVHgrGDTrpPZ
-wj+bCJr1RME2LeEvdWgY60KeKXWhIzQ5EoXXgE3sFGRQkGifbRZAhMXxz0xVlwQ8
-R2hO3KKD+eB5fLyM2aqMhj6a1a8OvOmGtja0josvE8ndmSzPnokwdtChOB3r5ve9
-2i5od5WdRyEsQ1ZKChAi10DyZbCkpLn/4KVXi/6XwQh5m4p4SeGAQGtfrdvZy2fg
-WOjaoM0U1Ux4QFhTijjhi7Pu/0zu4SReO4hVuaGJjs6JrpbDSdsi/vh9rGTx2ZIN
-lei+1r0/KirZUXep2UXRwlRH6HNnso01KspWrIQYSg==
-=V09s
+iQGcBAEBCAAGBQJUYQA7AAoJEJQzkH1pP7W4pY8L/1jtqnvsGXyn2zFAJCLPqVda
+IzZrEvW2ar03tiSh7+2h6Q8cH9NGwWBb8xTegqUrDWCxa82EPDMqOCdZqpnDhAOL
+oDH6e+baoGVlGjOM1wEpqEdaMo5Duk2pNprY89XFcCX7O/IlmAuYNvK4OrT00GxB
+993fGdu2bSiy+mFNBGBssqXuXCoEuSdg4wd/X6RyiGL+qpFls0Q1SWK/NE886bk2
+BWhh93G+tYWDzDrv6dZtR9erMgG7XQJdxuq5MWh63oUvovSJ5fM6zWZVwUss2xJF
+6qs5ueLFXTaQl+3Xb7zlTEqsni5aOsECXEIhG/s8CCjdHorWIDLyxK9M1fyOvnOv
+LGcg4w/9Dv87tJZkpY+vwlPObQvujQvlxO53E3JKpZiKNDT+mf8mRZmY979Er5+I
+1wzMAFK3KiYXGiQ487KErpAWmqkllQ/aDgAzVpApn7IorSutjjaQsrAfdo3f3nuV
+FIwsisrjMUj3NbzKWuO88PaMn39/SdWymo9rT8SyYw==
+=byIO
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140929.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140929.ebuild
deleted file mode 100644
index 6c7af1880389..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140929.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140929.ebuild,v 1.3 2014/10/28 13:08:27 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="trunk"
-	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}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# 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}"
-	S="${WORKDIR}/emacs"
-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 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 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
-			)
-		)
-		gtk? (
-			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 ) )
-			)
-		)
-	)"
-
-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() {
-	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 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
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		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)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	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+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	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/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# 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"
-		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
-
-	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-vcs/emacs-vcs-24.4.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild
index 5ebdba714442..6b8bee596b55 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild,v 1.5 2014/10/28 13:08:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild,v 1.6 2014/11/10 18:09:48 ulm Exp $
 
 EAPI=5
 
@@ -254,6 +254,9 @@ src_install () {
 	# 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 \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild
index 54b48a384ed5..9b2b52a828e2 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild,v 1.1 2014/11/10 09:29:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild,v 1.2 2014/11/10 18:09:48 ulm Exp $
 
 EAPI=5
 
@@ -254,6 +254,9 @@ src_install () {
 	# 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 \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
index 285a91c20ee0..04d5860eb43b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild,v 1.3 2014/10/28 13:08:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild,v 1.4 2014/11/10 18:09:48 ulm Exp $
 
 EAPI=5
 
@@ -254,6 +254,9 @@ src_install () {
 	# 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 \