| 1 |
commit: 3fba7c869869ae1359b7b4950755e07010d5fc3a |
| 2 |
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 8 14:47:49 2011 +0000 |
| 4 |
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de> |
| 5 |
CommitDate: Sun May 8 14:47:49 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3fba7c86 |
| 7 |
|
| 8 |
[sci-visualization/gnuplot] sync with tree and bug #366129#c11 |
| 9 |
|
| 10 |
(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-visualization/gnuplot/ChangeLog | 6 ++ |
| 14 |
...lot-4.4.9999.ebuild => gnuplot-4.4.3-r1.ebuild} | 63 +++++++++++++------ |
| 15 |
sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild | 63 +++++++++++++------ |
| 16 |
3 files changed, 92 insertions(+), 40 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog |
| 19 |
index 3f06e47..d13a5c0 100644 |
| 20 |
--- a/sci-visualization/gnuplot/ChangeLog |
| 21 |
+++ b/sci-visualization/gnuplot/ChangeLog |
| 22 |
@@ -2,6 +2,12 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+*gnuplot-4.4.3-r1 (08 May 2011) |
| 27 |
+ |
| 28 |
+ 08 May 2011; Christoph Junghans <ottxor@g.o> +gnuplot-4.4.3-r1.ebuild, |
| 29 |
+ gnuplot-4.4.9999.ebuild: |
| 30 |
+ sync with tree and bug #366129#c11 |
| 31 |
+ |
| 32 |
23 Feb 2011; Christoph Junghans <ottxor@g.o> gnuplot-4.5.9999.ebuild: |
| 33 |
updated deps |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild |
| 37 |
similarity index 81% |
| 38 |
copy from sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 39 |
copy to sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild |
| 40 |
index 9c29c61..be4fc1c 100644 |
| 41 |
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 42 |
+++ b/sci-visualization/gnuplot/gnuplot-4.4.3-r1.ebuild |
| 43 |
@@ -4,16 +4,24 @@ |
| 44 |
|
| 45 |
EAPI=3 |
| 46 |
|
| 47 |
-inherit autotools cvs elisp-common multilib wxwidgets |
| 48 |
+inherit elisp-common multilib wxwidgets |
| 49 |
|
| 50 |
DESCRIPTION="Command-line driven interactive plotting program" |
| 51 |
HOMEPAGE="http://www.gnuplot.info/" |
| 52 |
|
| 53 |
-ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot" |
| 54 |
-ECVS_MODULE="gnuplot" |
| 55 |
-ECVS_BRANCH="branch-4-4-stable" |
| 56 |
-ECVS_USER="anonymous" |
| 57 |
-ECVS_CVS_OPTIONS="-dP" |
| 58 |
+if [[ -z ${PV%%*9999} ]]; then |
| 59 |
+ inherit autotools cvs |
| 60 |
+ ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot" |
| 61 |
+ ECVS_MODULE="gnuplot" |
| 62 |
+ ECVS_BRANCH="branch-4-4-stable" |
| 63 |
+ ECVS_USER="anonymous" |
| 64 |
+ ECVS_CVS_OPTIONS="-dP" |
| 65 |
+ MY_P="${PN}" |
| 66 |
+ SRC_URI="" |
| 67 |
+else |
| 68 |
+ MY_P="${P/_/-}" |
| 69 |
+ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" |
| 70 |
+fi |
| 71 |
|
| 72 |
LICENSE="gnuplot GPL-2" |
| 73 |
SLOT="0" |
| 74 |
@@ -38,33 +46,35 @@ RDEPEND="!app-emacs/gnuplot-mode |
| 75 |
wxwidgets? ( x11-libs/wxGTK:2.8[X] |
| 76 |
x11-libs/cairo |
| 77 |
x11-libs/pango |
| 78 |
- >=x11-libs/gtk+-2.8:2 ) |
| 79 |
+ x11-libs/gtk+:2 ) |
| 80 |
X? ( x11-libs/libXaw ) |
| 81 |
xemacs? ( app-editors/xemacs |
| 82 |
- app-xemacs/xemacs-base |
| 83 |
- app-xemacs/texinfo )" |
| 84 |
+ app-xemacs/xemacs-base )" |
| 85 |
DEPEND="${RDEPEND} |
| 86 |
dev-util/pkgconfig |
| 87 |
doc? ( virtual/latex-base |
| 88 |
- app-text/ghostscript-gpl )" |
| 89 |
+ app-text/ghostscript-gpl ) |
| 90 |
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) ) |
| 91 |
+ !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )" |
| 92 |
|
| 93 |
-S="${WORKDIR}/${PN}" |
| 94 |
+S="${WORKDIR}/${MY_P}" |
| 95 |
GP_VERSION="${PV%.*}" |
| 96 |
E_SITEFILE="50${PN}-gentoo.el" |
| 97 |
TEXMF="${EPREFIX}/usr/share/texmf-site" |
| 98 |
|
| 99 |
src_prepare() { |
| 100 |
- local dir |
| 101 |
- for dir in config demo m4 term tutorial; do |
| 102 |
- emake -C "$dir" -f Makefile.am.in Makefile.am || \ |
| 103 |
- die "make -f Makefile.am.in Makefile.am in $dir failed" |
| 104 |
- done |
| 105 |
+ if [[ -z ${PV%%*9999} ]]; then |
| 106 |
+ local dir |
| 107 |
+ for dir in config demo m4 term tutorial; do |
| 108 |
+ emake -C "$dir" -f Makefile.am.in Makefile.am || \ |
| 109 |
+ die "make -f Makefile.am.in Makefile.am in $dir failed" |
| 110 |
+ done |
| 111 |
+ eautoreconf |
| 112 |
+ fi |
| 113 |
|
| 114 |
# Add special version identification as required by provision 2 |
| 115 |
# of the gnuplot license |
| 116 |
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die |
| 117 |
- |
| 118 |
- eautoreconf |
| 119 |
} |
| 120 |
|
| 121 |
src_configure() { |
| 122 |
@@ -96,7 +106,15 @@ src_configure() { |
| 123 |
&& myconf="${myconf} --with-readline=gnu" \ |
| 124 |
|| myconf="${myconf} --with-readline=builtin" |
| 125 |
|
| 126 |
- econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/" |
| 127 |
+ if has_version virtual/emacs; then |
| 128 |
+ emacs="emacs" |
| 129 |
+ elif has_version app-xemacs/texinfo; then |
| 130 |
+ emacs="xemacs" |
| 131 |
+ fi |
| 132 |
+ |
| 133 |
+ econf ${myconf} \ |
| 134 |
+ DIST_CONTACT="http://bugs.gentoo.org/" \ |
| 135 |
+ EMACS="${emacs}" |
| 136 |
|
| 137 |
if use xemacs; then |
| 138 |
einfo "Configuring gnuplot-mode for XEmacs ..." |
| 139 |
@@ -121,7 +139,7 @@ src_compile() { |
| 140 |
# example plots. |
| 141 |
addwrite /dev/svga:/dev/mouse:/dev/tts/0 |
| 142 |
|
| 143 |
- emake || die |
| 144 |
+ emake all info || die |
| 145 |
|
| 146 |
if use xemacs; then |
| 147 |
cd "${S}/lisp-xemacs" |
| 148 |
@@ -202,7 +220,12 @@ pkg_postinst() { |
| 149 |
use emacs && elisp-site-regen |
| 150 |
use latex && texmf-update |
| 151 |
|
| 152 |
+ einfo "Gnuplot no longer links against pdflib, see the ChangeLog for" |
| 153 |
+ einfo "details. You can use the \"pdfcairo\" terminal for PDF output." |
| 154 |
+ use cairo || einfo "It is available with USE=\"cairo\"." |
| 155 |
+ |
| 156 |
if use svga; then |
| 157 |
+ echo |
| 158 |
einfo "In order to enable ordinary users to use SVGA console graphics" |
| 159 |
einfo "gnuplot needs to be set up as setuid root. Please note that" |
| 160 |
einfo "this is usually considered to be a security hazard." |
| 161 |
|
| 162 |
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 163 |
index 9c29c61..be4fc1c 100644 |
| 164 |
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 165 |
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild |
| 166 |
@@ -4,16 +4,24 @@ |
| 167 |
|
| 168 |
EAPI=3 |
| 169 |
|
| 170 |
-inherit autotools cvs elisp-common multilib wxwidgets |
| 171 |
+inherit elisp-common multilib wxwidgets |
| 172 |
|
| 173 |
DESCRIPTION="Command-line driven interactive plotting program" |
| 174 |
HOMEPAGE="http://www.gnuplot.info/" |
| 175 |
|
| 176 |
-ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot" |
| 177 |
-ECVS_MODULE="gnuplot" |
| 178 |
-ECVS_BRANCH="branch-4-4-stable" |
| 179 |
-ECVS_USER="anonymous" |
| 180 |
-ECVS_CVS_OPTIONS="-dP" |
| 181 |
+if [[ -z ${PV%%*9999} ]]; then |
| 182 |
+ inherit autotools cvs |
| 183 |
+ ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot" |
| 184 |
+ ECVS_MODULE="gnuplot" |
| 185 |
+ ECVS_BRANCH="branch-4-4-stable" |
| 186 |
+ ECVS_USER="anonymous" |
| 187 |
+ ECVS_CVS_OPTIONS="-dP" |
| 188 |
+ MY_P="${PN}" |
| 189 |
+ SRC_URI="" |
| 190 |
+else |
| 191 |
+ MY_P="${P/_/-}" |
| 192 |
+ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz" |
| 193 |
+fi |
| 194 |
|
| 195 |
LICENSE="gnuplot GPL-2" |
| 196 |
SLOT="0" |
| 197 |
@@ -38,33 +46,35 @@ RDEPEND="!app-emacs/gnuplot-mode |
| 198 |
wxwidgets? ( x11-libs/wxGTK:2.8[X] |
| 199 |
x11-libs/cairo |
| 200 |
x11-libs/pango |
| 201 |
- >=x11-libs/gtk+-2.8:2 ) |
| 202 |
+ x11-libs/gtk+:2 ) |
| 203 |
X? ( x11-libs/libXaw ) |
| 204 |
xemacs? ( app-editors/xemacs |
| 205 |
- app-xemacs/xemacs-base |
| 206 |
- app-xemacs/texinfo )" |
| 207 |
+ app-xemacs/xemacs-base )" |
| 208 |
DEPEND="${RDEPEND} |
| 209 |
dev-util/pkgconfig |
| 210 |
doc? ( virtual/latex-base |
| 211 |
- app-text/ghostscript-gpl )" |
| 212 |
+ app-text/ghostscript-gpl ) |
| 213 |
+ !emacs? ( xemacs? ( app-xemacs/texinfo ) ) |
| 214 |
+ !emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )" |
| 215 |
|
| 216 |
-S="${WORKDIR}/${PN}" |
| 217 |
+S="${WORKDIR}/${MY_P}" |
| 218 |
GP_VERSION="${PV%.*}" |
| 219 |
E_SITEFILE="50${PN}-gentoo.el" |
| 220 |
TEXMF="${EPREFIX}/usr/share/texmf-site" |
| 221 |
|
| 222 |
src_prepare() { |
| 223 |
- local dir |
| 224 |
- for dir in config demo m4 term tutorial; do |
| 225 |
- emake -C "$dir" -f Makefile.am.in Makefile.am || \ |
| 226 |
- die "make -f Makefile.am.in Makefile.am in $dir failed" |
| 227 |
- done |
| 228 |
+ if [[ -z ${PV%%*9999} ]]; then |
| 229 |
+ local dir |
| 230 |
+ for dir in config demo m4 term tutorial; do |
| 231 |
+ emake -C "$dir" -f Makefile.am.in Makefile.am || \ |
| 232 |
+ die "make -f Makefile.am.in Makefile.am in $dir failed" |
| 233 |
+ done |
| 234 |
+ eautoreconf |
| 235 |
+ fi |
| 236 |
|
| 237 |
# Add special version identification as required by provision 2 |
| 238 |
# of the gnuplot license |
| 239 |
sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die |
| 240 |
- |
| 241 |
- eautoreconf |
| 242 |
} |
| 243 |
|
| 244 |
src_configure() { |
| 245 |
@@ -96,7 +106,15 @@ src_configure() { |
| 246 |
&& myconf="${myconf} --with-readline=gnu" \ |
| 247 |
|| myconf="${myconf} --with-readline=builtin" |
| 248 |
|
| 249 |
- econf ${myconf} DIST_CONTACT="http://bugs.gentoo.org/" |
| 250 |
+ if has_version virtual/emacs; then |
| 251 |
+ emacs="emacs" |
| 252 |
+ elif has_version app-xemacs/texinfo; then |
| 253 |
+ emacs="xemacs" |
| 254 |
+ fi |
| 255 |
+ |
| 256 |
+ econf ${myconf} \ |
| 257 |
+ DIST_CONTACT="http://bugs.gentoo.org/" \ |
| 258 |
+ EMACS="${emacs}" |
| 259 |
|
| 260 |
if use xemacs; then |
| 261 |
einfo "Configuring gnuplot-mode for XEmacs ..." |
| 262 |
@@ -121,7 +139,7 @@ src_compile() { |
| 263 |
# example plots. |
| 264 |
addwrite /dev/svga:/dev/mouse:/dev/tts/0 |
| 265 |
|
| 266 |
- emake || die |
| 267 |
+ emake all info || die |
| 268 |
|
| 269 |
if use xemacs; then |
| 270 |
cd "${S}/lisp-xemacs" |
| 271 |
@@ -202,7 +220,12 @@ pkg_postinst() { |
| 272 |
use emacs && elisp-site-regen |
| 273 |
use latex && texmf-update |
| 274 |
|
| 275 |
+ einfo "Gnuplot no longer links against pdflib, see the ChangeLog for" |
| 276 |
+ einfo "details. You can use the \"pdfcairo\" terminal for PDF output." |
| 277 |
+ use cairo || einfo "It is available with USE=\"cairo\"." |
| 278 |
+ |
| 279 |
if use svga; then |
| 280 |
+ echo |
| 281 |
einfo "In order to enable ordinary users to use SVGA console graphics" |
| 282 |
einfo "gnuplot needs to be set up as setuid root. Please note that" |
| 283 |
einfo "this is usually considered to be a security hazard." |
Archives