summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Martins <rafaelmartins@gentoo.org>2013-10-19 21:02:38 +0000
committerRafael Martins <rafaelmartins@gentoo.org>2013-10-19 21:02:38 +0000
commit44c26edc59c7c25dc587a50901bb782c9fdb6820 (patch)
tree4fb4327edbafee027a60503207bc1e035640344c /app-portage
parentVersion bump. Bug #488538. (diff)
downloadgentoo-2-44c26edc59c7c25dc587a50901bb782c9fdb6820.tar.gz
gentoo-2-44c26edc59c7c25dc587a50901bb782c9fdb6820.tar.bz2
gentoo-2-44c26edc59c7c25dc587a50901bb782c9fdb6820.zip
Fix .oct installation path. Thanks to Fabio Rossi (bug #488534).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key )
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/g-octave/ChangeLog12
-rw-r--r--app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch12
-rw-r--r--app-portage/g-octave/g-octave-0.4.1-r4.ebuild (renamed from app-portage/g-octave/g-octave-0.4.1-r3.ebuild)5
3 files changed, 24 insertions, 5 deletions
diff --git a/app-portage/g-octave/ChangeLog b/app-portage/g-octave/ChangeLog
index 8946f80140a4..128f6f102f19 100644
--- a/app-portage/g-octave/ChangeLog
+++ b/app-portage/g-octave/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-portage/g-octave
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/g-octave/ChangeLog,v 1.8 2012/12/03 01:12:33 rafaelmartins Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-octave/ChangeLog,v 1.9 2013/10/19 21:02:38 rafaelmartins Exp $
+
+*g-octave-0.4.1-r4 (19 Oct 2013)
+
+ 19 Oct 2013; Rafael G. Martins <rafaelmartins@gentoo.org>
+ +files/g-octave-0.4.1-fix-Makefile.patch, +g-octave-0.4.1-r4.ebuild,
+ -g-octave-0.4.1-r3.ebuild:
+ Fix .oct installation path. Thanks to Fabio Rossi (bug #488534).
*g-octave-0.4.1-r3 (03 Dec 2012)
@@ -40,4 +47,3 @@
27 Sep 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
+g-octave-0.4.ebuild, +metadata.xml:
Initial commit, moved from the science overlay. (bug #299039)
-
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
new file mode 100644
index 000000000000..53d3d5e0dbcd
--- /dev/null
+++ b/app-portage/g-octave/files/g-octave-0.4.1-fix-Makefile.patch
@@ -0,0 +1,12 @@
+--- share/g-octave.eclass 2013-05-30 19:01:07.980521612 +0200
++++ share/g-octave.eclass.new 2013-05-30 19:03:38.933514388 +0200
+@@ -48,6 +48,9 @@
+ for filename in Makefile configure; do
+ cp "${DISTDIR}/g-octave_${filename}" "${S}/${filename}"
+ done
++
++ sed -i -e 's@libexec@lib@g' "${S}/Makefile" || die 'sed failed.'
++
+ chmod 0755 "${S}/configure"
+ if [ -e "${S}"/src/autogen.sh ]; then
+ cd "${S}"/src && ./autogen.sh || die 'failed to run autogen.sh'
diff --git a/app-portage/g-octave/g-octave-0.4.1-r3.ebuild b/app-portage/g-octave/g-octave-0.4.1-r4.ebuild
index 2aa199bcf587..0ad6b4138801 100644
--- a/app-portage/g-octave/g-octave-0.4.1-r3.ebuild
+++ b/app-portage/g-octave/g-octave-0.4.1-r4.ebuild
@@ -1,6 +1,6 @@
-# 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-portage/g-octave/g-octave-0.4.1-r3.ebuild,v 1.1 2012/12/03 01:12:33 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-octave/g-octave-0.4.1-r4.ebuild,v 1.1 2013/10/19 21:02:38 rafaelmartins Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -32,6 +32,7 @@ src_prepare() {
distutils_src_prepare
epatch "${FILESDIR}/${P}-add_cave_support.patch"
epatch "${FILESDIR}/${P}-fix-sourceforge-svn-root.patch"
+ epatch "${FILESDIR}/${P}-fix-Makefile.patch"
sed -i -e 's/^has_fetch.*$/has_fetch = False/' scripts/g-octave \
|| die 'failed to patch the g-octave main script'
}