diff options
| author |   Rafael Martins <rafaelmartins@gentoo.org> | 2016-11-06 23:44:38 +0100 |
|---|---|---|
| committer | Rafael Martins <rafaelmartins@gentoo.org> | 2016-11-06 23:44:38 +0100 |
| commit | a766a6c843d1585533beb5f1096b6c165b3aaaa5 (patch) | |
| tree | f1b88d706b9a5b2bbd3b0f5c48f7334310d676aa | |
| parent | app-portage/g-octave: ported to distutils-r1 (diff) | |
| download | gentoo-a766a6c843d1585533beb5f1096b6c165b3aaaa5.tar.gz gentoo-a766a6c843d1585533beb5f1096b6c165b3aaaa5.tar.bz2 gentoo-a766a6c843d1585533beb5f1096b6c165b3aaaa5.zip | |
app-portage/g-octave: apply patches using PATCHES variable
Package-Manager: portage-2.2.28
3 files changed, 14 insertions, 12 deletions
diff --git a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch index 1ef90c9200ed..27468c1bba5a 100644 --- a/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch +++ b/app-portage/g-octave/files/g-octave-0.4.1-add_cave_support.patch @@ -1,5 +1,5 @@ ---- ./g-octave-0.4.1/g_octave/package_manager.py 2010-10-23 23:37:26.000000000 +0200 -+++ ./g-octave-0.4.1/g_octave/package_manager.py 2011-05-25 12:52:10.510019006 +0200 +--- g-octave-0.4.1/g_octave/package_manager.py 2010-10-23 23:37:26.000000000 +0200 ++++ g-octave-0.4.1/g_octave/package_manager.py 2011-05-25 12:52:10.510019006 +0200 @@ -15,6 +15,7 @@ 'Portage', 'Pkgcore', @@ -65,8 +65,8 @@ + for line in p.stdout: + packages.append(line.strip()) + return packages ---- ./g-octave-0.4.1/scripts/g-octave 2011-05-25 12:00:25.740019020 +0200 -+++ ./g-octave-0.4.1/scripts/g-octave 2011-05-25 12:00:39.434019008 +0200 +--- g-octave-0.4.1/scripts/g-octave 2011-05-25 12:00:25.740019020 +0200 ++++ g-octave-0.4.1/scripts/g-octave 2011-05-25 12:00:39.434019008 +0200 @@ -217,7 +217,7 @@ return os.EX_DATAERR return os.EX_OK 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 index 53d3d5e0dbcd..af56b4f75d96 100644 --- 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 @@ -1,5 +1,5 @@ ---- 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 +--- g-octave-0.4.1/share/g-octave.eclass 2013-05-30 19:01:07.980521612 +0200 ++++ g-octave-0.4.1/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}" diff --git a/app-portage/g-octave/g-octave-0.4.1-r5.ebuild b/app-portage/g-octave/g-octave-0.4.1-r5.ebuild index 0267b6938092..7a5cd898ea19 100644 --- a/app-portage/g-octave/g-octave-0.4.1-r5.ebuild +++ b/app-portage/g-octave/g-octave-0.4.1-r5.ebuild @@ -27,9 +27,11 @@ DEPEND="doc? ( >=dev-python/sphinx-1.0 )" RDEPEND="sys-apps/portage" python_prepare_all() { - epatch "${FILESDIR}/${P}-add_cave_support.patch" - epatch "${FILESDIR}/${P}-fix-sourceforge-svn-root.patch" - epatch "${FILESDIR}/${P}-fix-Makefile.patch" + local PATCHES=( + "${FILESDIR}/${P}-add_cave_support.patch" + "${FILESDIR}/${P}-fix-sourceforge-svn-root.patch" + "${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' distutils-r1_python_prepare_all @@ -70,10 +72,10 @@ pkg_postinst() { pkg_config() { local db="$(g-octave --config db)" - mkdir -p "${db}" + mkdir -p "${db}" || die 'mkdir failed.' einfo "Extracting g-octave database files to: ${db}" tar -xzf "${DISTDIR}/${PN}-db-${DB_COMMIT:0:7}.tar.gz" -C "${db}" || die 'tar failed.' - rm -rf "${db}"/{patches,octave-forge,info.json,manifest.json,timestamp} + rm -rf "${db}"/{patches,octave-forge,info.json,manifest.json,timestamp} || die 'rm db files failed.' mv -f "${db}/${DB_DIR}"/* "${db}" || die 'mv failed.' - rm -rf "${db}/${DB_DIR}" + rm -rf "${db}/${DB_DIR}" || die 'rm db dir failed.' } |