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

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

5 files changed, 11 insertions, 19 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 6912f7d..79f44b0 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/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-cvs-23.0.91.ebuild,
+  emacs-cvs-23.0.9998.ebuild, emacs-cvs-23.0.9999-r1.ebuild:
+  Depend on emacs-common-gentoo. Don't install subdirs.el.
+
 *emacs-cvs-23.0.91 (07 Mar 2009)
 *emacs-cvs-23.0.9999-r1 (07 Mar 2009)
 
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 1b20af4..c98bd92 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,6 +1,6 @@
 DIST emacs-23.0.91.tar.gz 43011675 RMD160 dd0f93a06d3f1179d96ec32a91866ba4dadc4a27 SHA1 47df77669910c82eb1ef60d827235f11a486c2de SHA256 d0915f56a3c68090687d22a6f8d94f0e6edbf92c3600c746b512439863bf39fd
-EBUILD emacs-cvs-23.0.91.ebuild 8959 RMD160 a01d88ddf26c426440163e4f6822dbc071c3ef59 SHA1 4b01e7f140584eedea910f973bc381c726dd8a7f SHA256 e13d7ae3be426e047751f687f0bfcd3bc93fc75a5dff5302b365a1282f006db3
-EBUILD emacs-cvs-23.0.9998.ebuild 9196 RMD160 c395d400e7d2f7b69c2262038552aa9957c96b48 SHA1 06f6dfe35ccc0c52b6b813d4412c8ab70c5839a5 SHA256 f145c4f2b008f5eb0fb6d4855843b4c367fa8d5ba1f20f7947195b9a4a826c70
-EBUILD emacs-cvs-23.0.9999-r1.ebuild 8959 RMD160 a01d88ddf26c426440163e4f6822dbc071c3ef59 SHA1 4b01e7f140584eedea910f973bc381c726dd8a7f SHA256 e13d7ae3be426e047751f687f0bfcd3bc93fc75a5dff5302b365a1282f006db3
-MISC ChangeLog 624 RMD160 e2006f513067a120119b19f27abb0dd450c07638 SHA1 ae3b0856470af4517483a42216d1da54869c1942 SHA256 af491435469f0c53778acb1c529dc6eea5a49ea37e6bd60eb78bbe0f3353296e
+EBUILD emacs-cvs-23.0.91.ebuild 8805 RMD160 296045c64bafa2e5cb40abe8a39ad18492bb019d SHA1 44417230c1b33115b051ac56293ac7c7756650f1 SHA256 5d3482eb9e98a12d5b7e3ebe179ad0e7a5e3c35634aa79ee8c50fdd5f2d07504
+EBUILD emacs-cvs-23.0.9998.ebuild 9042 RMD160 87e7a5896d99f0a50499dca3ebdf1d919d959bf7 SHA1 ea1583b43b8f8105e3f0be997d5bab87a1203500 SHA256 fcb193ddf281b8622d4bb3f21aa729a63d003e4c807f65c8a5feb22ff8fff8d5
+EBUILD emacs-cvs-23.0.9999-r1.ebuild 8805 RMD160 296045c64bafa2e5cb40abe8a39ad18492bb019d SHA1 44417230c1b33115b051ac56293ac7c7756650f1 SHA256 5d3482eb9e98a12d5b7e3ebe179ad0e7a5e3c35634aa79ee8c50fdd5f2d07504
+MISC ChangeLog 818 RMD160 8f1529129339ac4af1fbd1c1c4c99f35cbe5a901 SHA1 d2201622249318e1817127d67d0ad7a673e94d4e SHA256 7c63878ae8bb77bf2ea9b1338b837364f1d714ebb51b4fddb4e2b637f8848355
 MISC metadata.xml 1529 RMD160 e40abfeff829d64e9f7d699d4e8fc5c4d6097bb5 SHA1 b2c01905cf0230739a45ad86bfbec800f8562c9f SHA256 b24dbef03ac32c182f69573275d416d664537eee2667e1e8c3199d4d34f3b20e
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.91.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.91.ebuild
index 71844ae..be7f8ea 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.91.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.91.ebuild
@@ -39,6 +39,7 @@ RESTRICT="strip"
 
 RDEPEND="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 )
@@ -50,7 +51,6 @@ RDEPEND="sys-libs/ncurses
 		x11-libs/libXmu
 		x11-libs/libXt
 		x11-misc/xbitmaps
-		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
 		png? ( media-libs/libpng )
@@ -221,7 +221,6 @@ src_install () {
 	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 /usr/share/emacs/site-lisp
 	keepdir /var/lib/games/emacs
 
 	local c=";;"
@@ -270,9 +269,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}"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9998.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9998.ebuild
index ee352b1..8533ecf 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9998.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9998.ebuild
@@ -40,6 +40,7 @@ RESTRICT="strip"
 
 RDEPEND="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 )
@@ -51,7 +52,6 @@ RDEPEND="sys-libs/ncurses
 		x11-libs/libXmu
 		x11-libs/libXt
 		x11-misc/xbitmaps
-		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
 		png? ( media-libs/libpng )
@@ -225,7 +225,6 @@ src_install () {
 	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 /usr/share/emacs/site-lisp
 	keepdir /var/lib/games/emacs
 
 	local c=";;"
@@ -274,9 +273,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}"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
index 71844ae..be7f8ea 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999-r1.ebuild
@@ -39,6 +39,7 @@ RESTRICT="strip"
 
 RDEPEND="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 )
@@ -50,7 +51,6 @@ RDEPEND="sys-libs/ncurses
 		x11-libs/libXmu
 		x11-libs/libXt
 		x11-misc/xbitmaps
-		x11-misc/emacs-desktop
 		gif? ( media-libs/giflib )
 		jpeg? ( media-libs/jpeg )
 		png? ( media-libs/libpng )
@@ -221,7 +221,6 @@ src_install () {
 	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 /usr/share/emacs/site-lisp
 	keepdir /var/lib/games/emacs
 
 	local c=";;"
@@ -270,9 +269,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}"