Fix build failure with texinfo-5.1, bug 464288. Update EAPI. Specify LICENSE more precisely.

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 45 insertions, 30 deletions

diff --git a/app-emacs/elib/ChangeLog b/app-emacs/elib/ChangeLog
index b658697628c8..49f9abd7b6d4 100644
--- a/app-emacs/elib/ChangeLog
+++ b/app-emacs/elib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/elib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/elib/ChangeLog,v 1.17 2012/01/15 15:56:15 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/elib/ChangeLog,v 1.18 2013/04/03 20:12:14 ulm Exp $
+
+  03 Apr 2013; Ulrich Müller <ulm@gentoo.org> elib-1.0-r1.ebuild,
+  +files/elib-1.0-texinfo-5.patch:
+  Fix build failure with texinfo-5.1, bug 464288. Update EAPI. Specify LICENSE
+  more precisely.
 
   15 Jan 2012; Ulrich Müller <ulm@gentoo.org> -elib-1.0.ebuild:
   Remove old.
diff --git a/app-emacs/elib/Manifest b/app-emacs/elib/Manifest
index 0de6c6922e6e..09bbb77ea763 100644
--- a/app-emacs/elib/Manifest
+++ b/app-emacs/elib/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 50elib-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
+AUX elib-1.0-texinfo-5.patch 285 SHA256 c501e5773a6a638f21048f90f2db44bc0343cd6d0b9dd4f58f8c72216d7fa504 SHA512 fb4656dd8dc80ffbb9a243f2d632e65a241c32d557283079b1552accb3d393c87eccbce735dbffff83d854618e1ac0d689448bc20c30eb4e4481eaedcd91ae81 WHIRLPOOL a6f38f7ce7652a31ca2d54596ef6a479e71076689b4192220be7226ee8f37108414af01a09e920185b5fb7159da8e42aa71d37dbddef8ee7d8ece1b762050a00
 DIST elib-1.0.tar.gz 58335 SHA256 2109764b6220e2936e7d98effc323723f688f148dc66519cdb79d07bfe82f134 SHA512 ca5d6e0861f3d8d049911a9e4455169263bd781992103baacadae560fce0fedddb734617338cb5fac51420fcb2035622042836fa7198fe7bec312a0015da266d WHIRLPOOL 3093777dcddade3d4c69deaff9b9c23a2e53f6ec747e536e435d352e881230d183299663fc73a0173bda94d3862aef744ea5f4e387c1fd5cb9002091b3a71847
-EBUILD elib-1.0-r1.ebuild 973 SHA256 3648eb4c1a2bd151bb3bcca60cdd8bf80263e149ce20dd6337a7a7209c014eb5 SHA512 572a8274768bb21996eb89b102a33ef53e73d6b013135971ff685823e62e460481a55ac2bdcbc1f3aa5c0a3e46fde3857d6f6fedc47425189e9caf4915dbe481 WHIRLPOOL 835815f85c9920e57ef0c99ede42f8cd6a584e78252eebdf89bfba9d2a28ced15149f11dc3d81649b65dd73cd7822ad67a65aa4b1336c633f5890a887fabae7b
-MISC ChangeLog 1894 SHA256 8b2c0858e26d1ad7da9887914c6e9fb23bb765341966a3ce31f1f2de7d941f9a SHA512 b4ad1f60237b5cc4184412f5228b465fa9c1a239299dfac878692b2da8238238a1de88050669aabfce3055c5fd14a1246ee88ff1674b3240087e27a878c85e07 WHIRLPOOL 8d4f3e0e1dbcba94fb9881c9725af699b1d99b996b6f441a042e1047451194d45a52c965356f7250da628e17b8eba0bc9d66b79d841e4f908283dd942937c2f1
+EBUILD elib-1.0-r1.ebuild 866 SHA256 6f13791a46a080522b209754183a4871433c06c907e701fcaa6d5fc997c96291 SHA512 c89200a15d389345cca778894888770ea8455f8fa11fcc86c882c1d13a604f52a6b6b6518c572c72f69e3becfc6a2c27d457172ec62729d9cc9f823e18da4084 WHIRLPOOL ffecb896622d40b7ca5b4f9c6e05f5c07d1c33ef947b5fe2b437d8ef1a43ce2b93bc0e48f8091369bb627bd56369f0fd46c696e484650f3d9b94011d5849f066
+MISC ChangeLog 2094 SHA256 0fb902d8acedfbe497ce863354c056a37d2efb77134a85587259fdacc92bbb50 SHA512 27efdcd462cfc50ff5ecddbfec0e7ae0f11c6cd07df5a218a0d604d237c10de91754983dd448536e4de34c97d6a32956bba358654c8f7de84b67288832fc24c4 WHIRLPOOL 37a4c984beb9aab575b65370ff416a644c16ef034fabe2decbbbdfdd8a28e6a1a85bdb65878f7a58ae311ab62e8d300a1f2d33392222cc8e8d9ff0062355857e
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e0aAAoJEDxpGckxwJCBJT8P/icrpOVIIjbMOH1b0EZLYy84
-XWbz59oEHpBufuo4HrXu/z43BbBasRm9E/bAg62DKQnCQ06Of/vPMESl3exD82uQ
-TM/jGM4w1XnMVMX9VqXHsHlue811t/4o3qzFlzt2oyPEk8/oyh0Dubr20cmac0Jx
-p0fPxOYEU8uQeMMBddb9use7d3G7v/GeN2O3WwYjE5l4gQteU7bdcIi2EFy9QBJW
-ZNGZFxhrbnbJyFeI+WqDnx0k9pBrymMNsFWj0myPOdK5s7Fp90385PqWSItVEuQG
-TnaB+2Y/LzyQ3NH+aARptOYylhgYWVudDVVD/csMj/fwAhh3BUkmyA56eZ7X1yUy
-xYGdHvW7chxVEZJUPo5lbzVfFpgNiFpIT75sXb/IDkxQObOZjsWULq0zbk4MmGzz
-5aHo5YcWbaunHtZKSy+ee5ng1cYT50KKIX/QV0OqQB9ErmQHS4LXqQIRdz0GWD0I
-w4iLdX7aAykVzA0QyNZHfaxpmJWc2TVtBvYsYwsuIIjLDy4CZ+d+cj0aU/hC6ih7
-ksSasS3nCoRrhe05oH6YWETpE33Ux1vaWc9GBBovvpwtTubu72L+834sGfw/dzz9
-cVi5Sro7/Gg6+Ba6lN4wLQCUWYmkAIwNN2hEYTV0qzH3+Ck3yshzAxZtb5ete4Nt
-kWzkC2DN1VAuiQcJKoU6
-=DbwI
+iQGcBAEBCAAGBQJRXI1GAAoJEJQzkH1pP7W49coMAJeoz8aTb0EBU8d4opCebqQe
+9oCR592IyPS8iV2+CY3eqDKVsNKwOf83D29fvxEPHPlPKyAX5BCZ2XyV/Du32WYw
+A2XAbB/Ga4Aj/sglg7rR+Kj7yeSaS2Nb06HGihv29uOFWc4U+WHDQbGaQ/aQ+H05
+WKvsJpo18t+eV9nwK6WPRkKpiWkGR9AfgCdmbwF4ohgkM/XF37XDRyX+ufuOD6Qp
+p8NsYDW8GkcoH0HNfP/RU0mnzmVSPx6H0dvoAw+Rb110mmoe1rsc76gkPr+a72jk
+2Zy39wqdzgsiDozGnmBH0b924Frvt485ERStz9bJLMgSr728WiSx6wVwvvw9bzmE
+Ts3brpYXpsNOD0JZRQz+BYO25MylrUbwW3do+Cg2Gk5RAy0kaUgEow+zsbDKrSmI
+58xZ6ZDHe/Hk72uhN0Gcy7ZRFTL3TSidZUfRPbKvfzgNbEO4Hdit0SiF7rE08qix
+xjH0qSoxS3bk69iDRVIgOqBLJwD+iaHD7Hyhjt+sQg==
+=30L4
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/elib/elib-1.0-r1.ebuild b/app-emacs/elib/elib-1.0-r1.ebuild
index 9a0679d9ca33..88745f4721da 100644
--- a/app-emacs/elib/elib-1.0-r1.ebuild
+++ b/app-emacs/elib/elib-1.0-r1.ebuild
@@ -1,36 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/elib/elib-1.0-r1.ebuild,v 1.4 2012/01/15 15:53:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/elib/elib-1.0-r1.ebuild,v 1.5 2013/04/03 20:12:14 ulm Exp $
 
-EAPI=3
+EAPI=5
 
-inherit elisp
+inherit elisp eutils
 
 DESCRIPTION="The Emacs Lisp Library"
 HOMEPAGE="http://jdee.sourceforge.net"
 SRC_URI="http://jdee.sunsite.dk/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-texinfo-5.patch"
 	sed -i 's:--infodir:--info-dir:g' Makefile || die
 }
 
-# This is NOT redundant, elisp.eclass redefines src_compile
 src_compile() {
-	emake || die "emake failed"
+	default
 }
 
 src_install() {
 	dodir "${SITELISP}/elib"
 	dodir /usr/share/info
-	emake prefix="${ED}/usr" infodir="${ED}/usr/share/info" install \
-		|| die "emake install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc ChangeLog NEWS README TODO || die "dodoc failed"
+	emake prefix="${ED}/usr" infodir="${ED}/usr/share/info" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc ChangeLog NEWS README TODO
 }
diff --git a/app-emacs/elib/files/elib-1.0-texinfo-5.patch b/app-emacs/elib/files/elib-1.0-texinfo-5.patch
new file mode 100644
index 000000000000..53d18d248355
--- /dev/null
+++ b/app-emacs/elib/files/elib-1.0-texinfo-5.patch
@@ -0,0 +1,14 @@
+--- elib-1.0-orig/elib.texi
++++ elib-1.0/elib.texi
+@@ -33,9 +33,9 @@
+ @sp 4
+ @comment The title is printed in a large font.
+ @center @titlefont{User's Guide}
+-@sp
++@sp 1
+ @center @titlefont{to}
+-@sp
++@sp 1
+ @center @titlefont{Elib - The Emacs Lisp Library}
+ @sp 2
+ @center version 1.0