Patches moved into patchset.

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

5 files changed, 9 insertions, 80 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ad4f8ad..cbd8276 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild,
+  -files/emacs-23.2-gnu-linux-crt-dir.patch,
+  -files/emacs-23.2-ns-appdirs.patch:
+  Patches moved into patchset.
+
   25 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild,
   +files/emacs-23.2-gnu-linux-crt-dir.patch:
   Honour the --with-crt-dir configure option also on 32 bit architectures,
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5483dae..331768c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,14 +1,12 @@
-AUX emacs-23.2-gnu-linux-crt-dir.patch 790 RMD160 df58bdd129939df87d286f597ff5c3f37604a3b1 SHA1 108e6295b2be27ef969f45d38f71770944c3c0cb SHA256 b3cc464300ab58937b20c519accd7debcae0cc7c2885d7dde2340b0ce96c5b17
-AUX emacs-23.2-ns-appdirs.patch 1660 RMD160 cbed96140c194b7d562cc4671c314d8b9d04e64b SHA1 367f27817c11e033bc8f38de505943ebbcd6abdd SHA256 f12ed4b3b6f4ec141672e87ba7ba8bb717739a186ea854e98047ecde09e43280
 DIST emacs-21.4-patches-11.tar.bz2 13005 RMD160 2a55e7e102659d978e9069f56d188c91a721f468 SHA1 f1068df11532aadc38c0ebb618f9d420add3f2bb SHA256 10f76aa765ae9de34b3a36fbfa8391cb1be1dd97e0f78700623b3d9a3c68902c
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3-patches-6.tar.bz2 5278 RMD160 2a3b57cf2fbed502a2de52d3cf28c0ba6fd9470a SHA1 4752d9733cad948910a4296f032fdc878328f7cf SHA256 dd4c7f315faa2ebfc093e845d6a7610102af5974614d7352e861436499f17275
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
-DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c
+DIST emacs-23.2-patches-3.tar.bz2 3122 RMD160 6d008cf875916fb41d99844d90bd59c2a16cd053 SHA1 500c2c4faee31e04d108b8a2946cce98d72a9c9f SHA256 25b83ed7f2ae87fbf816e7b28c68eec723c05c6c23e999f51b0d94cc51c8c1c9
 DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-21.4-r23.ebuild 5019 RMD160 83385af5aaed6fe97262908b040346e2278a5e9d SHA1 15c3ca2917d94b8dcb6a960bb4fc2959b0e85c46 SHA256 5a1d1f0df477f371eed9c256b5070d25742f6638f9ff2bf7ab20e5abcabf90db
 EBUILD emacs-22.3-r7.ebuild 7922 RMD160 c9443e4c4a89a6d8cfe736c3e06a973d56cc336c SHA1 89fa3bd31666854a9e42d9b02b06a8625213fd98 SHA256 d3fdfd8726b97aa6d2528e666aebe0d9ad39731af6a7ad34e9cfde1cec292f36
-EBUILD emacs-23.2-r3.ebuild 11041 RMD160 11ac382a1b0a4f59611b5a122299456fc2fccd3e SHA1 33fe86d41cd786ebd4bfeb7cee8d135b6e816b6b SHA256 deb7300aea24fea4e21dfd9361e7401d22e09252168e0b630d7b661d2142eb67
-MISC ChangeLog 1739 RMD160 bf70d6f7c3d7ff3c4e0598d17599faadaa1c4e28 SHA1 f24f4685eb7c1ed4415dc0ae9c664d6f19687bf9 SHA256 b2fc2498f617c4e208dd0e91d767bd237e174f5c53f9669247c077441d0eeec4
+EBUILD emacs-23.2-r3.ebuild 10944 RMD160 93e7161525e930b2498a0b66fae4ed21c0a91b35 SHA1 216280bd3912aeb7ae876bd0be2bf678d465658d SHA256 18cb8d51fa78f3eb9a24bcdcc5318f564dc2af35c7f893babb6c84676a1b6f9b
+MISC ChangeLog 1923 RMD160 79dfa48f6395b937a718aa15cbfa13c7670b441f SHA1 ffca161a741443412f360106f3df8188240acae7 SHA256 fa917fe9623b1d1c27a7efbb6a37ee1cfcef6cf3cba72d1e04f4ba9b154673e1
 MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010
diff --git a/app-editors/emacs/emacs-23.2-r3.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild
index 9bf49e6..0700570 100644
--- a/app-editors/emacs/emacs-23.2-r3.ebuild
+++ b/app-editors/emacs/emacs-23.2-r3.ebuild
@@ -15,7 +15,7 @@ if [ "${PV##*.}" = "9999" ]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-		mirror://gentoo/${P}-patches-2.tar.bz2"
+		mirror://gentoo/${P}-patches-3.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
@@ -92,8 +92,6 @@ src_prepare() {
 		echo
 	else
 		EPATCH_SUFFIX=patch epatch
-		epatch "${FILESDIR}/${P}-gnu-linux-crt-dir.patch"
-		epatch "${FILESDIR}/${P}-ns-appdirs.patch"
 	fi
 
 	sed -i \
diff --git a/app-editors/emacs/files/emacs-23.2-gnu-linux-crt-dir.patch b/app-editors/emacs/files/emacs-23.2-gnu-linux-crt-dir.patch
deleted file mode 100644
index fb06459..0000000
--- a/app-editors/emacs/files/emacs-23.2-gnu-linux-crt-dir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/350532
-
---- emacs-23.2-orig/src/s/gnu-linux.h
-+++ emacs-23.2/src/s/gnu-linux.h
-@@ -168,7 +168,7 @@
- /* Ask GCC where to find libgcc.a.  */
- #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
- 
--#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-+#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
- 
- /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
-    says where to find X windows at run time.  */
-@@ -198,7 +198,7 @@
- #define LIBS_DEBUG
- #undef LIB_GCC
- #define LIB_GCC
--#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
-+#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
- 
- /* Don't use -g in test compiles in configure.
-    This is so we will use the same shared libs for that linking
diff --git a/app-editors/emacs/files/emacs-23.2-ns-appdirs.patch b/app-editors/emacs/files/emacs-23.2-ns-appdirs.patch
deleted file mode 100644
index 2e34e90..0000000
--- a/app-editors/emacs/files/emacs-23.2-ns-appdirs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=268793
-
---- emacs-23.2-orig/configure.in
-+++ emacs-23.2/configure.in
-@@ -1417,10 +1417,10 @@
-   window_system=nextstep
-   with_xft=no
-   # set up packaging dirs
--  exec_prefix=${ns_appbindir}
--  libexecdir=${ns_appbindir}/libexec
-   if test "${EN_NS_SELF_CONTAINED}" = yes; then
-      prefix=${ns_appresdir}
-+     exec_prefix=${ns_appbindir}
-+     libexecdir=${ns_appbindir}/libexec
-   fi
- fi
- CFLAGS="$tmp_CFLAGS"
---- emacs-23.2-orig/leim/Makefile.in
-+++ emacs-23.2/leim/Makefile.in
-@@ -263,11 +263,6 @@
- 	  [ -n "$${installuser}" ] && break ; \
- 	done ; \
- 	find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
--	if [ "${ns_appresdir}" != "" ]; then \
--	  ( cd ${ns_appresdir} ; \
--	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
--	    rm -fr share ) ; \
--	else true ; fi
- 
- clean mostlyclean:
- 	rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \
---- emacs-23.2-orig/Makefile.in
-+++ emacs-23.2/Makefile.in
-@@ -424,16 +424,6 @@
- 	    ${INSTALL_DATA} lib-src/$$f $(DESTDIR)${archlibdir}/$$f; \
- 	  else true; fi ; \
- 	done
--	if test "${ns_appdir}" != ""; then \
--	  ( cd ${ns_appresdir} ; \
--	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
--	    if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
--	    rm -fr share ) ; \
--	  ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
--	    rm -fr emacs ) ; \
--	  ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \
--	    ln -sf ../libexec/* .) ; \
--	else true ; fi
- 
- ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
- ## Needs to be the user running install, so configure can't set it.