| 1 |
opfer 07/10/04 00:03:33 |
| 2 |
|
| 3 |
Modified: gnuplot-4.2.0-r2.ebuild ChangeLog |
| 4 |
gnuplot-4.2.2.ebuild |
| 5 |
Log: |
| 6 |
fix a typo in 4.2.0; exchange all make with emake; use SITELISP variable from elisp-common.eclass instead of hard coded path for GNU Emacs support file installation; delete X11 support files when not having USE=X (see bug 194527) |
| 7 |
(Portage version: 2.1.3.9) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: gnuplot-4.2.0-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- gnuplot-4.2.0-r2.ebuild 23 Sep 2007 17:08:15 -0000 1.7 |
| 23 |
+++ gnuplot-4.2.0-r2.ebuild 4 Oct 2007 00:03:32 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2007 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild,v 1.7 2007/09/23 17:08:15 nixnut Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild,v 1.8 2007/10/04 00:03:32 opfer Exp $ |
| 29 |
|
| 30 |
inherit eutils elisp-common multilib wxwidgets |
| 31 |
|
| 32 |
@@ -55,7 +55,7 @@ |
| 33 |
# See bug #156427. |
| 34 |
if use tetex ; then |
| 35 |
sed -i \ |
| 36 |
- -e 's/TEXMFLOCAL/TEXTMFSITE/g' share/Makefile.in || die "sed failed" |
| 37 |
+ -e 's/TEXMFLOCAL/TEXMFSITE/g' share/Makefile.in || die "sed failed" |
| 38 |
else |
| 39 |
sed -i \ |
| 40 |
-e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || die "sed failed" |
| 41 |
@@ -96,21 +96,21 @@ |
| 42 |
|
| 43 |
if use doc ; then |
| 44 |
cd docs |
| 45 |
- make pdf || die "pdf doc creation failed" |
| 46 |
+ emake pdf || die "pdf doc creation failed" |
| 47 |
cd ../tutorial |
| 48 |
- make pdf || die "pdf tutorial failed" |
| 49 |
+ emake pdf || die "pdf tutorial failed" |
| 50 |
fi |
| 51 |
} |
| 52 |
|
| 53 |
src_install () { |
| 54 |
- make DESTDIR="${D}" install || die "make install failed" |
| 55 |
+ emake DESTDIR="${D}" install || die "emake install failed" |
| 56 |
|
| 57 |
if use emacs; then |
| 58 |
cd lisp |
| 59 |
einfo "Configuring gnuplot-mode for GNU Emacs..." |
| 60 |
- EMACS="emacs" econf --with-lispdir="/usr/share/emacs/site-lisp/${PN}" || die "econf Emacs files faild" |
| 61 |
- make DESTDIR="${D}" install || die "make install Emacs files failed" |
| 62 |
- make clean |
| 63 |
+ EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die "econf Emacs files faild" |
| 64 |
+ emake DESTDIR="${D}" install || die "make install Emacs files failed" |
| 65 |
+ emake clean |
| 66 |
cd .. |
| 67 |
|
| 68 |
# Gentoo emacs site-lisp configuration |
| 69 |
@@ -124,7 +124,7 @@ |
| 70 |
cd lisp |
| 71 |
einfo "Configuring gnuplot-mode for XEmacs..." |
| 72 |
EMACS="xemacs" econf --with-lispdir="/usr/$(get_libdir)/xemacs/site-packages/${PN}" || die |
| 73 |
- make DESTDIR="${D}" install || { |
| 74 |
+ emake DESTDIR="${D}" install || { |
| 75 |
ewarn "Compiling/installing gnuplot-mode for xemacs has failed." |
| 76 |
ewarn "I need xemacs-base to be installed before I can compile" |
| 77 |
ewarn "the gnuplot-mode lisp files for xemacs successfully." |
| 78 |
@@ -151,6 +151,11 @@ |
| 79 |
insinto /usr/share/doc/${PF}/psdoc |
| 80 |
doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} |
| 81 |
fi |
| 82 |
+ |
| 83 |
+ if ! use X; then |
| 84 |
+ # see bug 194527 |
| 85 |
+ rm -rf "${D}/usr/$(get_libdir)/X11" |
| 86 |
+ fi |
| 87 |
} |
| 88 |
|
| 89 |
pkg_postinst() { |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.44 sci-visualization/gnuplot/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.44&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/ChangeLog?rev=1.44&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/ChangeLog?r1=1.43&r2=1.44 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v |
| 102 |
retrieving revision 1.43 |
| 103 |
retrieving revision 1.44 |
| 104 |
diff -u -r1.43 -r1.44 |
| 105 |
--- ChangeLog 23 Sep 2007 17:08:15 -0000 1.43 |
| 106 |
+++ ChangeLog 4 Oct 2007 00:03:32 -0000 1.44 |
| 107 |
@@ -1,6 +1,13 @@ |
| 108 |
# ChangeLog for sci-visualization/gnuplot |
| 109 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.43 2007/09/23 17:08:15 nixnut Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.44 2007/10/04 00:03:32 opfer Exp $ |
| 112 |
+ |
| 113 |
+ 04 Oct 2007; Christian Faulhammer <opfer@g.o> |
| 114 |
+ gnuplot-4.2.0-r2.ebuild, gnuplot-4.2.2.ebuild: |
| 115 |
+ fix a typo in 4.2.0; exchange all make with emake; use SITELISP variable |
| 116 |
+ from elisp-common.eclass instead of hard coded path for GNU Emacs support |
| 117 |
+ file installation; delete X11 support files when not having USE=X (see bug |
| 118 |
+ 194527) |
| 119 |
|
| 120 |
23 Sep 2007; nixnut <nixnut@g.o> gnuplot-4.2.0-r2.ebuild: |
| 121 |
Stable on ppc wrt bug 189672 |
| 122 |
|
| 123 |
|
| 124 |
|
| 125 |
1.7 sci-visualization/gnuplot/gnuplot-4.2.2.ebuild |
| 126 |
|
| 127 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild?rev=1.7&view=markup |
| 128 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild?rev=1.7&content-type=text/plain |
| 129 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild?r1=1.6&r2=1.7 |
| 130 |
|
| 131 |
Index: gnuplot-4.2.2.ebuild |
| 132 |
=================================================================== |
| 133 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild,v |
| 134 |
retrieving revision 1.6 |
| 135 |
retrieving revision 1.7 |
| 136 |
diff -u -r1.6 -r1.7 |
| 137 |
--- gnuplot-4.2.2.ebuild 20 Sep 2007 16:09:28 -0000 1.6 |
| 138 |
+++ gnuplot-4.2.2.ebuild 4 Oct 2007 00:03:32 -0000 1.7 |
| 139 |
@@ -1,6 +1,6 @@ |
| 140 |
# Copyright 1999-2007 Gentoo Foundation |
| 141 |
# Distributed under the terms of the GNU General Public License v2 |
| 142 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild,v 1.6 2007/09/20 16:09:28 jer Exp $ |
| 143 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild,v 1.7 2007/10/04 00:03:32 opfer Exp $ |
| 144 |
|
| 145 |
inherit eutils elisp-common multilib wxwidgets |
| 146 |
|
| 147 |
@@ -107,21 +107,21 @@ |
| 148 |
|
| 149 |
if use doc ; then |
| 150 |
cd docs |
| 151 |
- make pdf || die "pdf doc creation failed" |
| 152 |
+ emake pdf || die "pdf doc creation failed" |
| 153 |
cd ../tutorial |
| 154 |
- make pdf || die "pdf tutorial failed" |
| 155 |
+ emake pdf || die "pdf tutorial failed" |
| 156 |
fi |
| 157 |
} |
| 158 |
|
| 159 |
src_install () { |
| 160 |
- make DESTDIR="${D}" install || die "make install failed" |
| 161 |
+ emake DESTDIR="${D}" install || die "make install failed" |
| 162 |
|
| 163 |
if use emacs; then |
| 164 |
cd lisp |
| 165 |
einfo "Configuring gnuplot-mode for GNU Emacs..." |
| 166 |
- EMACS="emacs" econf --with-lispdir="/usr/share/emacs/site-lisp/${PN}" || die "econf Emacs files faild" |
| 167 |
- make DESTDIR="${D}" install || die "make install Emacs files failed" |
| 168 |
- make clean |
| 169 |
+ EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die "econf Emacs files faild" |
| 170 |
+ emake DESTDIR="${D}" install || die "make install Emacs files failed" |
| 171 |
+ emake clean |
| 172 |
cd .. |
| 173 |
|
| 174 |
# Gentoo emacs site-lisp configuration |
| 175 |
@@ -135,7 +135,7 @@ |
| 176 |
cd lisp |
| 177 |
einfo "Configuring gnuplot-mode for XEmacs..." |
| 178 |
EMACS="xemacs" econf --with-lispdir="/usr/$(get_libdir)/xemacs/site-packages/${PN}" || die |
| 179 |
- make DESTDIR="${D}" install || { |
| 180 |
+ emake DESTDIR="${D}" install || { |
| 181 |
ewarn "Compiling/installing gnuplot-mode for xemacs has failed." |
| 182 |
ewarn "I need xemacs-base to be installed before I can compile" |
| 183 |
ewarn "the gnuplot-mode lisp files for xemacs successfully." |
| 184 |
@@ -162,6 +162,11 @@ |
| 185 |
insinto /usr/share/doc/${PF}/psdoc |
| 186 |
doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README} |
| 187 |
fi |
| 188 |
+ |
| 189 |
+ if ! use X; then |
| 190 |
+ # see bug 194527 |
| 191 |
+ rm -rf "${D}/usr/$(get_libdir)/X11" |
| 192 |
+ fi |
| 193 |
} |
| 194 |
|
| 195 |
pkg_postinst() { |
| 196 |
|
| 197 |
|
| 198 |
|
| 199 |
-- |
| 200 |
gentoo-commits@g.o mailing list |
Archives