Depend on emacs-common-gentoo. Don't install subdirs.el.

svn path=/emacs-overlay/; revision=1310

4 files changed, 12 insertions, 16 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 15d7c5a..5e16916 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Mar 2009; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r17.ebuild,
+  emacs-22.3-r2.ebuild:
+  Depend on emacs-common-gentoo. Don't install subdirs.el.
+
 *emacs-22.3-r2 (07 Mar 2009)
 
   07 Mar 2009; Ulrich Mueller <ulm@gentoo.org>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index caa11db..f56f36c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,7 +6,7 @@ DIST emacs-21.4-patches-6.tar.bz2 11785 RMD160 01edee136f6cd88611fa632227f685c1b
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-21.4-r17.ebuild 5351 RMD160 2779c83b862d7cde6e7de5357da4dd11350dd756 SHA1 fbcdb901ddfd3c45388f4aa2e8c013c5c69bf7fe SHA256 bf9fdc4b015f9c4f4db8e6d54edf70b44325a48b0e53033562bb944e9f911398
-EBUILD emacs-22.3-r2.ebuild 7953 RMD160 ca54f31ce764c53869d9b51fc78e79f7ade156af SHA1 0add0d9d9e954f0c8181385b66b83b559397bc1f SHA256 1ccb171189df0bccf219405ea8765b98118621ab63eaaae1ff641af27fb8ed54
-MISC ChangeLog 704 RMD160 1bda6db02d4820716e0e58c6afd45f55eceaefbb SHA1 a2a2bc6c50261638657be6b02acb20542a6e2f70 SHA256 ac33389106e6235fbdbdda5da7bf8b8bc02a2bbd71988b2426c9731ae66602ad
+EBUILD emacs-21.4-r17.ebuild 5208 RMD160 f03880805429c47cbc1950063de65b5c1a921844 SHA1 1216cf0511011599f39f61ced9edaca70ef4a93c SHA256 948ed858b08e0b4390add5da9775ec22056b2d6c0888cbe1f47bad7d68bdcab6
+EBUILD emacs-22.3-r2.ebuild 7799 RMD160 a63e3837c1b156a9fa88be40f48eee4aee9b5318 SHA1 9a207dd477a1560448a4eecd3265dcad79c2ac2e SHA256 08473dd02650acd0d9139adb69b6318c7e4c72a4eb6640d42d7709a92d789169
+MISC ChangeLog 858 RMD160 8a4a9252cd09c41f4c11c928a3d0e4a7dba1127e SHA1 b602c0d30d615e50cd1866c3f9bb02f8e438c6cd SHA256 3cc59f3099d603592e043de331cf8916e509d1a1e1f6acd7ed4eeee73b778950
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
diff --git a/app-editors/emacs/emacs-21.4-r17.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild
index ff9ac74..34d1f5e 100644
--- a/app-editors/emacs/emacs-21.4-r17.ebuild
+++ b/app-editors/emacs/emacs-21.4-r17.ebuild
@@ -19,22 +19,22 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE="X Xaw3d leim motif nls sendmail"
 
 RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	>=app-emacs/emacs-common-gentoo-1[X?]
+	sendmail? ( virtual/mta )
 	X? (
 		x11-libs/libXext
 		x11-libs/libICE
 		x11-libs/libSM
 		x11-libs/libXmu
 		x11-libs/libXpm
-		x11-misc/emacs-desktop
 		>=media-libs/giflib-4.1.0.1b
 		>=media-libs/jpeg-6b-r2
 		>=media-libs/tiff-3.5.5-r3
 		>=media-libs/libpng-1.2.1
 		Xaw3d? ( x11-libs/Xaw3d )
 		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-	)
-	sendmail? ( virtual/mta )
-	>=app-admin/eselect-emacs-1.2"
+	)"
 
 DEPEND="${RDEPEND}
 	X? ( x11-misc/xbitmaps )"
@@ -143,7 +143,6 @@ src_install() {
 	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
 
 	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
 
 	dodoc BUGS ChangeLog README
 }
@@ -166,9 +165,6 @@ emacs-infodir-rebuild() {
 }
 
 pkg_postinst() {
-	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
-		cp "${ROOT}"/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
-
 	emacs-infodir-rebuild
 
 	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild
index 08d3a79..5ee1d18 100644
--- a/app-editors/emacs/emacs-22.3-r2.ebuild
+++ b/app-editors/emacs/emacs-22.3-r2.ebuild
@@ -19,6 +19,7 @@ RESTRICT="strip"
 RDEPEND="!<app-editors/emacs-cvs-22.1
 	sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
+	>=app-emacs/emacs-common-gentoo-1[X?]
 	net-libs/liblockfile
 	hesiod? ( net-dns/hesiod )
 	kerberos? ( virtual/krb5 )
@@ -28,7 +29,6 @@ RDEPEND="!<app-editors/emacs-cvs-22.1
 		x11-libs/libXmu
 		x11-libs/libXt
 		x11-misc/xbitmaps
-		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
 		tiff? ( media-libs/tiff )
@@ -179,7 +179,6 @@ src_install () {
 	# avoid collision between slots, see bug #169033 e.g.
 	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
 	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /usr/share/emacs/site-lisp
 	keepdir /var/lib/games/emacs
 
 	local c=";;"
@@ -228,9 +227,6 @@ emacs-infodir-rebuild() {
 }
 
 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}"