Don't depend on Emacs with USE="-emacs -xemacs". Update outdated texinfo file, bug 366129.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

3 files changed, 18 insertions, 21 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index b0435f984ae1..c2e2024ac959 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.155 2011/05/28 12:54:20 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.156 2011/05/29 09:17:18 ulm Exp $
+
+  29 May 2011; Ulrich Mueller <ulm@gentoo.org> gnuplot-4.4.3-r1.ebuild:
+  Don't depend on Emacs with USE="-emacs -xemacs". Update outdated texinfo
+  file, bug 366129.
 
 *gnuplot-4.4.3-r1 (28 May 2011)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index d3064bd2ea01..b2177dbddb58 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -9,21 +9,18 @@ AUX gnuplot-gentoo-version.patch 2079 RMD160 394bee0853cb9343864342a2a11a4453af3
 DIST gnuplot-4.2.5-lua-term.patch.bz2 26660 RMD160 981db04276ce51ece9b95076856b9811de872e3d SHA1 845fffa290d66e51ce5924d020a1d9b3bf354986 SHA256 32f39b4eb14e41f22fc911c73adf740e38af0819315ee102449ad4e572ab1b7f
 DIST gnuplot-4.2.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a76 SHA1 d11fdde8218bee98597ee836cbc17e4bf6093b70 SHA256 81fbc2eb6077bd6abfe98c5c82aae14a2c970473ee4c2c37743ff3b1e2aa8e82
 DIST gnuplot-4.4.2.tar.gz 3299690 RMD160 077d6d353e0370d1f8463693380030722f5789af SHA1 35666be22e877ade5e272199d3d81555c141cef5 SHA256 37e8c8d4838fb84a3ad97a6c4823f086b929cb18d6613a2d0e8227ce0d4de9e4
+DIST gnuplot-4.4.3-texinfo-update.patch.gz 7519 RMD160 73188caf8edbc84d11b43ea16a93fb5c9bece959 SHA1 dbd8d69214ae99411a2ffcc63f309cd342622865 SHA256 6153e081a0165682b052188a0166408e353a03be5fa1465d889c75f56d32700a
 DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc4 SHA1 a4d315b9288739e3cbaa04d8ddda7861b4009bd4 SHA256 6faa236ed5c744f34a9ac58ef89dab6177a15c5835dc3644a0a12779439426e6
 EBUILD gnuplot-4.2.6-r2.ebuild 6207 RMD160 82509ca48ef70de10a3d7606619b32ef22eb2ee2 SHA1 83a7c5272ceab4f6214a7c76d1e6ce91c71e9ef3 SHA256 3baf97adb0c118f66d0d2402a4ca84daff17995f7c58b4bc4480c6299e4af3a3
 EBUILD gnuplot-4.4.2-r1.ebuild 6127 RMD160 33002726f6e94e0eda1df996787806e443c705da SHA1 8c2dbe949e7b644c2e1ace9d404b889460b1775a SHA256 6ceea186fe74ca9d45dc5865a6c21a7acd77827e381c9311b9e5a8fae6e7dc24
-EBUILD gnuplot-4.4.3-r1.ebuild 6831 RMD160 0970ba561ca357205ba0d5b924baf15cc6df7bdf SHA1 6464d43980b65a1a85a1f5e5dcb9d34676cb0649 SHA256 650154166f17a27f266149ab78a146a80d54fe08cd49a1d4434476fcceda3005
+EBUILD gnuplot-4.4.3-r1.ebuild 6764 RMD160 766116698f3c228b03bc5d18984904af7a2a2c5f SHA1 2036e09169304aa32760c9169ddebf7153c38d54 SHA256 36088a83070e5a56d296b42b2efcd1387a9ceef7c9c2bcf363a1bb2513bc6fa6
 EBUILD gnuplot-4.4.3.ebuild 6187 RMD160 14cd8ee37e638ec9ccd4bee37162e70d547f3b6f SHA1 cfaffdb48e97e784250509d933e8b52b7ee4712d SHA256 f7bc48f05c53480634bfd2de68bb942a09cd78dc2dd851cdea345dbd664390c5
-MISC ChangeLog 29207 RMD160 65c9e847388a61efaa4ae7b114b186e022fd525d SHA1 5c69285aef043db9897e735eb9ce05f79de8516e SHA256 f1db728dfde908f7a100754a5a0f9d8adba833808834f61609bd0013d55ffa28
+MISC ChangeLog 29372 RMD160 2ebec454978979c481d3d5ec684e9b0b5ad84aa1 SHA1 e726569397625b5509df13817df12625223e6860 SHA256 0f10340ab60caff2c26716f2390709217b76e5de397a94b994ff247b447e40b4
 MISC metadata.xml 511 RMD160 d1aca682659cec35000b5beb01d035313865a7e8 SHA1 f0168f6f851e7729a3033383f50e3495b813657e SHA256 dff37a68daad7ef0f042891288528d693183726bff6c685c3bf579a8dd228e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN4PCBAAoJEOeBhlrCAAWG544H/3LNaj8eilWFygDfaRuQ23Cf
-Li8iMLuaNHdND+M5T5ZmpDxErmnWo/g8vphsYR72HZcYPlG9XSf1F2zBUpu++6ZS
-5fcHKkFxUbaAFjdf5JHpu9+iZqQZCboXSbbiM7P00dw5K1dhkpDX4Zcwe6P7xH6A
-GxYd4AgIzHDH1ET6s6GkQ9gmx2yaUx1tM91XDKxdGYzX4zsTNO1qgRjOb6uquOsG
-b6l5xVf0RUHtuvurpk26mIE/O5MaYODTahRuvogK3EIdoUAfnQ50HFFEWiA/kMD5
-vAH/K5GP3JiMTqC+43cmawY8p42E05uZ/RewOczSFtJYes/MWQ3UVik87uwQBJ4=
-=Xew6
+iEYEARECAAYFAk3iD9EACgkQOeoy/oIi7uw6XwCgksky7AF77Kt5GGQa2YYZJqVh
+EogAoJwNh15FfPnkI0rKf50NbBmsaiSP
+=Nm4F
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
index 3f72a52a7be0..7fead1f47f6c 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.1 2011/05/28 12:54:20 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild,v 1.2 2011/05/29 09:17:18 ulm Exp $
 
 EAPI=3
 
@@ -20,7 +20,8 @@ if [[ -z ${PV%%*9999} ]]; then
 	SRC_URI=""
 else
 	MY_P="${P/_/-}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
+	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
+		mirror://gentoo/${P}-texinfo-update.patch.gz"
 fi
 
 LICENSE="gnuplot GPL-2"
@@ -54,8 +55,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( virtual/latex-base
 		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )
-	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
+	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
 
 S="${WORKDIR}/${MY_P}"
 GP_VERSION="${PV%.*}"
@@ -70,6 +70,8 @@ src_prepare() {
 				die "make -f Makefile.am.in Makefile.am in $dir failed"
 		done
 		eautoreconf
+	else
+		epatch "${WORKDIR}"/${P}-texinfo-update.patch
 	fi
 
 	# Add special version identification as required by provision 2
@@ -106,15 +108,9 @@ src_configure() {
 		&& myconf="${myconf} --with-readline=gnu" \
 		|| myconf="${myconf} --with-readline=builtin"
 
-	if has_version virtual/emacs; then
-		emacs="emacs"
-	elif has_version app-xemacs/texinfo; then
-		emacs="xemacs"
-	fi
-
 	econf ${myconf} \
 		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS="${emacs}"
+		EMACS=$(usev emacs || usev xemacs)
 
 	if use xemacs; then
 		einfo "Configuring gnuplot-mode for XEmacs ..."