sci-visualization/gnuplot: Revert uncalled-for cosmetic changes.

- Restore canonical ordering of KEYWORDS (first by OS, then by arch).
- Avoid an overlong line and undesired Emacs hilighting in src_prepare.
- default_src_install does more than emake install and may install
  spurious doc files.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild
index 107cac8a01bad804eb73d9922c62c450799cd23d..c682ff4aa9111a0ac92ba633deb8b40af20239f0 100644 (file)
--- a/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.5.ebuild
@@ -22,7 +22,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
        MY_P="${P/_/.}"
        SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-aix ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
@@ -71,6 +71,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
 
 src_prepare() {
        default
+
        if [[ -z ${PV%%*9999} ]]; then
                local dir
                for dir in config demo m4 term tutorial; do
@@ -84,7 +85,9 @@ src_prepare() {
 
        # hacky workaround
        # Please hack the buildsystem if you like
-       use prefix && use qt4 && append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+       if use prefix && use qt4; then
+               append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+       fi
 
        DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
                for details. You can use the "pdfcairo" terminal for PDF output.'
@@ -98,7 +101,7 @@ src_prepare() {
                environment variables. See the FAQ file in /usr/share/doc/${PF}/
                for more information.'
 
-       mv configure.{in,ac} || die
+       mv configure.in configure.ac || die
        eautoreconf
 
        # Make sure we don't mix build & host flags.
@@ -166,7 +169,7 @@ src_compile() {
 }
 
 src_install () {
-       default
+       emake DESTDIR="${D}" install
 
        dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
        newdoc term/PostScript/README README-ps

diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
index b5c6063ab67486fad924057375aae884b3bc682a..4570b60feb59d94d2b5573579b58fef0a70884fd 100644 (file)
--- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild
@@ -22,7 +22,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
        MY_P="${P/_/.}"
        SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-aix ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
@@ -71,6 +71,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.0.1-fix-underlinking.patch )
 
 src_prepare() {
        default
+
        if [[ -z ${PV%%*9999} ]]; then
                local dir
                for dir in config demo m4 term tutorial; do
@@ -84,7 +85,9 @@ src_prepare() {
 
        # hacky workaround
        # Please hack the buildsystem if you like
-       use prefix && use qt4 && append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+       if use prefix && use qt4; then
+               append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+       fi
 
        DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
                for details. You can use the "pdfcairo" terminal for PDF output.'
@@ -98,7 +101,7 @@ src_prepare() {
                environment variables. See the FAQ file in /usr/share/doc/${PF}/
                for more information.'
 
-       mv configure.{in,ac} || die
+       mv configure.in configure.ac || die
        eautoreconf
 
        # Make sure we don't mix build & host flags.
@@ -166,7 +169,7 @@ src_compile() {
 }
 
 src_install () {
-       default
+       emake DESTDIR="${D}" install
 
        dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
        newdoc term/PostScript/README README-ps

diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
index a8e8c6b05a1f19632d9d502f915eb86df6c8bde0..185a8e6d47ae157a63200390616f0b7035205648 100644 (file)
--- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild
@@ -22,7 +22,7 @@ if [[ -z ${PV%%*9999} ]]; then
 else
        MY_P="${P/_/.}"
        SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-aix ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
@@ -69,6 +69,7 @@ TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
        default
+
        if [[ -z ${PV%%*9999} ]]; then
                local dir
                for dir in config demo m4 term tutorial; do
@@ -82,7 +83,9 @@ src_prepare() {
 
        # hacky workaround
        # Please hack the buildsystem if you like
-       use prefix && use qt4 && append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+       if use prefix && use qt4; then
+               append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
+       fi
 
        DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
                for details. You can use the "pdfcairo" terminal for PDF output.'
@@ -96,7 +99,7 @@ src_prepare() {
                environment variables. See the FAQ file in /usr/share/doc/${PF}/
                for more information.'
 
-       mv configure.{in,ac} || die
+       mv configure.in configure.ac || die
        eautoreconf
 
        # Make sure we don't mix build & host flags.
@@ -164,7 +167,7 @@ src_compile() {
 }
 
 src_install () {
-       default
+       emake DESTDIR="${D}" install
 
        dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
        newdoc term/PostScript/README README-ps