From: Alexis Ballier Date: Sat, 24 Apr 2010 11:12:34 +0000 (+0000) Subject: fix build with clisp-2.48, by Semen Cirit, bug #281271 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8851f672bc80a5e6669e38575980c42ee991b1a0;p=gentoo.git fix build with clisp-2.48, by Semen Cirit, bug #281271 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/app-text/xindy/ChangeLog b/app-text/xindy/ChangeLog index fdde00b258ef..f286f9ade225 100644 --- a/app-text/xindy/ChangeLog +++ b/app-text/xindy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/xindy -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/ChangeLog,v 1.9 2009/05/30 08:35:31 ulm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/ChangeLog,v 1.10 2010/04/24 11:12:33 aballier Exp $ + + 24 Apr 2010; Alexis Ballier xindy-2.3.ebuild, + +files/xindy-2.3-clisp-2.48.patch: + fix build with clisp-2.48, by Semen Cirit, bug #281271 30 May 2009; Ulrich Mueller xindy-2.3.ebuild: Remove app-text/tetex from dependencies, bug 227443. diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest index d29952b98e54..fdc6d4ca5e3f 100644 --- a/app-text/xindy/Manifest +++ b/app-text/xindy/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX xindy-2.3-clisp-2.48.patch 926 RMD160 e69195dca913eb0575ece7de6b92845fda193f3d SHA1 9cb2bbfa7b3dbe2ed436b16effde30bcbe278ddb SHA256 52ef75a6e0c254e4c9943357b43aca677003a5aa852a3c6a1350456fced8dc48 DIST xindy-2.3.tar.gz 10695987 RMD160 ab9421f1f5ce8fe471839944fd42fddc26ac1a8f SHA1 9cbbc659f50a9791a30c8c98fa5c38b58e29527e SHA256 671cc69b3c02f1ee43250dfee117931b6dc33cc701e225819589787d2bf05071 -EBUILD xindy-2.3.ebuild 959 RMD160 f2668b981ce5a801ab0dec20cb469f4176a54d4c SHA1 41af36fdc3e36558913cff692f32ca572267767b SHA256 707ddeda286dd67d26bdde6bedb13d6514419e0b29515c3b1d1089f6729377e9 -MISC ChangeLog 1370 RMD160 5cbab400123fdbe55f19b275293063f1aa07b440 SHA1 fdc4d633f5349c06454ade6dbdcbad77fa1ef6b3 SHA256 c21b6428b1307dc040eb86dbb9480a98af9c3569e8f032bc99f408c7642a4dba +EBUILD xindy-2.3.ebuild 1106 RMD160 6fb0208f44d06970dfe762e9457c3e18a4b8f233 SHA1 32d5dd20cf5d4919580b2088bb4bc40c36424b13 SHA256 bbe48b198be587d86b7cea8e234b6fe5aaa197d191f91e17ce49f2a84bf794ae +MISC ChangeLog 1541 RMD160 2a14b90163f3519fe5d95f9def164845f55a4f12 SHA1 5e38c2b6f6ac9e711855eb7d498059e0cc87acc0 SHA256 e51f3bc5f5a60da390ef614238508dad30420e50d2b9cb253b4891fcba4b768e MISC metadata.xml 922 RMD160 27f6f0108b293a73c241beae84eb9d783c5d6c2d SHA1 a698270b26bf5c30cc9616388ef49cfc52dded4c SHA256 c3bbfb04edd75f7fa8aae555c735d8006c6feb1802c5ec17d3f5fc742b9a0202 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkog8C4ACgkQOeoy/oIi7uwE0gCglzbQqEWzGdkW3mW72ZM++Mtd -qT0An1/YfRrQOSdZOHzSTojfD2WAoTz9 -=VmJ4 +iEYEARECAAYFAkvS0igACgkQvFcC4BYPU0pfZACeLph6Fl8Ae9St/X+yteQWIvUj +k2UAoMhnlUd927bu/PQdAqMMeatYTXm7 +=vLqx -----END PGP SIGNATURE----- diff --git a/app-text/xindy/files/xindy-2.3-clisp-2.48.patch b/app-text/xindy/files/xindy-2.3-clisp-2.48.patch new file mode 100644 index 000000000000..cb00a03f1f49 --- /dev/null +++ b/app-text/xindy/files/xindy-2.3-clisp-2.48.patch @@ -0,0 +1,24 @@ +diff -Nuar rte.orig/Makefile.am rte/Makefile.am +--- rte.orig/Makefile.am 2009-09-07 11:32:27.960203413 +0300 ++++ rte/Makefile.am 2009-09-07 11:33:18.297274183 +0300 +@@ -75,7 +75,7 @@ + xindy-build-dir: $(CLISP_PREREQ) + $(RM_R) xindy-build-dir + $(MAKE) -C ordrules ordrulei.c +- $(clisp_link) add-module-set ordrules $(fulldir) $@ ++ $(clisp_link) add $(fulldir) $@ ordrules + cp $@/lisp.run $(binariesdir)/xindy.run + cp $@/lispinit.mem $(binariesdir)/base.mem + +diff -Nuar rte.orig/Makefile.in rte/Makefile.in +--- rte.orig/Makefile.in 2009-09-07 11:32:28.150197349 +0300 ++++ rte/Makefile.in 2009-09-07 11:32:54.205447337 +0300 +@@ -318,7 +318,7 @@ + xindy-build-dir: $(CLISP_PREREQ) + $(RM_R) xindy-build-dir + $(MAKE) -C ordrules ordrulei.c +- $(clisp_link) add-module-set ordrules $(fulldir) $@ ++ $(clisp_link) add $(fulldir) $@ ordrules + cp $@/lisp.run $(binariesdir)/xindy.run + cp $@/lispinit.mem $(binariesdir)/base.mem + diff --git a/app-text/xindy/xindy-2.3.ebuild b/app-text/xindy/xindy-2.3.ebuild index b247d90a4f44..fda70a04fbcf 100644 --- a/app-text/xindy/xindy-2.3.ebuild +++ b/app-text/xindy/xindy-2.3.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/xindy-2.3.ebuild,v 1.9 2009/05/30 08:35:31 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xindy/xindy-2.3.ebuild,v 1.10 2010/04/24 11:12:33 aballier Exp $ + +inherit eutils DESCRIPTION="A Flexible Indexing System" @@ -18,6 +20,12 @@ RDEPEND="virtual/latex-base DEPEND="${RDEPEND} sys-devel/flex" +src_unpack() { + unpack ${A} + cd "${S}" + has_version '>=dev-lisp/clisp-2.48' && epatch "${FILESDIR}/${P}-clisp-2.48.patch" +} + src_compile() { local clisp_dir clisp_dir=`clisp --version | grep "Installation directory:" | sed 's/Installation directory: //'`