Attachment #74420 for bug #110626




MD5 5cc9673076ae709340ebf4ff4884744f emacs-cvs-22.0.50.ebuild 4690
MD5 c8244b63bcc048773ba7032226f7dd20 ChangeLog 5647
MD5 51368777d6f87a10073e5f0063b3438d emacs-cvs-22.0.50.ebuild 4959
MD5 5a408b847c13cb5a004d9f3f5b495e8f emacs-cvs-23.0.0.ebuild 4709
MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50 0
MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242
MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
MD5 5585d3da10b713e4f268c2ab75b4b2da files/emacs-23.0.0.desktop 240
MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
MD5 91da809381cbee2642bee45da75c182b files/xft-bgalpha.patch 690
MD5 3a1b3ce71cc21223bd102617c38cd23e files/xft-invertcursor.patch 1033
MD5 2e8d8757cc9ed43a0ffe56c8dbcb93df files/xft-xfaces-fixcrash.patch 631
MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158

Lines 14-22 Link Here

(-)emacs-cvs-22.0.50.ebuild (-6 / +25 lines)
14		14
15	inherit elisp-common cvs alternatives flag-o-matic eutils	15	inherit elisp-common cvs alternatives flag-o-matic eutils
16		16
17	IUSE="X Xaw3d aqua gif gnome gtk jpeg nls png spell tiff"	17	IUSE="X Xaw3d aqua gif gnome gtk jpeg nls png spell tiff xft"
		18
		19	S=${WORKDIR}/emacs
18		20
19	S=${WORKDIR}/${ECVS_MODULE}
20	DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."	21	DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
21	SRC_URI=""	22	SRC_URI=""
22	HOMEPAGE="http://www.gnu.org/software/emacs"	23	HOMEPAGE="http://www.gnu.org/software/emacs"
Lines 46-61 Link Here
46		47
47	DFILE=emacs-${SLOT}.desktop	48	DFILE=emacs-${SLOT}.desktop
48		49
49	src_compile() {	50	src_unpack() {
		51	if use xft; then
		52	ECVS_BRANCH=XFT_JHD_BRANCH
		53	else
		54	ECVS_BRANCH=HEAD
		55	fi
		56	cvs_src_unpack
		57	cd ${S};
		58	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
		59	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
		60	if use xft; then
		61	epatch ${FILESDIR}/xft-invertcursor.patch
		62	epatch ${FILESDIR}/xft-bgalpha.patch
		63	epatch ${FILESDIR}/xft-xfaces-fixcrash.patch
		64	fi
		65	}
50		66
		67	src_compile() {
51	# no flag is allowed	68	# no flag is allowed
52	ALLOWED_FLAGS=" "	69	ALLOWED_FLAGS=" "
53	strip-flags	70	strip-flags
54	unset LDFLAGS	71	unset LDFLAGS
55		72
56	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
57	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
58
59	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* \|\| die	73	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* \|\| die
60		74
61	local myconf	75	local myconf
Lines 78-83 Link Here
78	myconf="${myconf} --without-gtk"	92	myconf="${myconf} --without-gtk"
79	myconf="${myconf} --with-x-toolkit=lucid"	93	myconf="${myconf} --with-x-toolkit=lucid"
80	fi	94	fi
		95	if use xft; then
		96	# this is only relevant when the source is patched for XFT
		97	# support, so it must remain within this if/then block
		98	myconf="${myconf} $(use_with xft)"
		99	fi
81	fi	100	fi
82		101
83	if use aqua ; then	102	if use aqua ; then

Return to bug 110626

Lines 1-13 Link Here

(-)Manifest (-6 / +9 lines)
1	MD5 5cc9673076ae709340ebf4ff4884744f emacs-cvs-22.0.50.ebuild 4690
2	MD5 c8244b63bcc048773ba7032226f7dd20 ChangeLog 5647	1	MD5 c8244b63bcc048773ba7032226f7dd20 ChangeLog 5647
3	MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158	2	MD5 51368777d6f87a10073e5f0063b3438d emacs-cvs-22.0.50.ebuild 4959
4	MD5 5a408b847c13cb5a004d9f3f5b495e8f emacs-cvs-23.0.0.ebuild 4709	3	MD5 5a408b847c13cb5a004d9f3f5b495e8f emacs-cvs-23.0.0.ebuild 4709
5	MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80	4	MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
		5	MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
		6	MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
6	MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50 0	7	MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50 0
7	MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
8	MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0	8	MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
9	MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242	9	MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242
10	MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
11	MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
12	MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
13	MD5 5585d3da10b713e4f268c2ab75b4b2da files/emacs-23.0.0.desktop 240	10	MD5 5585d3da10b713e4f268c2ab75b4b2da files/emacs-23.0.0.desktop 240
		11	MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
		12	MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
		13	MD5 91da809381cbee2642bee45da75c182b files/xft-bgalpha.patch 690
		14	MD5 3a1b3ce71cc21223bd102617c38cd23e files/xft-invertcursor.patch 1033
		15	MD5 2e8d8757cc9ed43a0ffe56c8dbcb93df files/xft-xfaces-fixcrash.patch 631
		16	MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158