summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-04-01 16:33:23 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-04-01 16:33:23 +0000
commit72ed455f6d3c6b617eeae851ec5c7ffc706b0888 (patch)
tree1d551ad9754ee9aa963dcb30bc065a1fa9a3f42a /net-dialup
parentPass -DWITH_TRANSLATIONS=OFF when nls is disabled. Thanks to hasufell for the... (diff)
downloadgentoo-2-72ed455f6d3c6b617eeae851ec5c7ffc706b0888.tar.gz
gentoo-2-72ed455f6d3c6b617eeae851ec5c7ffc706b0888.tar.bz2
gentoo-2-72ed455f6d3c6b617eeae851ec5c7ffc706b0888.zip
Fix building with automake >=1.11.2, wrt bug #424892. Thanks to Dennis Freise for discovering this issue and for providing patch
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/capisuite/ChangeLog7
-rw-r--r--net-dialup/capisuite/capisuite-0.4.5-r6.ebuild5
-rw-r--r--net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch12
3 files changed, 22 insertions, 2 deletions
diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index 72cae4d74515..976f879f7c89 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-dialup/capisuite
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.41 2013/04/01 13:47:49 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.42 2013/04/01 16:33:23 pinkbyte Exp $
+
+ 01 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> capisuite-0.4.5-r6.ebuild,
+ +files/capisuite-0.4.5-automake-1.11.patch:
+ Fix building with automake >=1.11.2, wrt bug #424892. Thanks to Dennis Freise
+ for discovering this issue and for providing patch
01 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> capisuite-0.4.5-r6.ebuild:
Fix HOMEPAGE and SRC_URI, wrt bug #327787. Thanks to René Neumann for
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
index f7503c5364b5..334c02677c2a 100644
--- a/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
+++ b/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild,v 1.6 2013/04/01 13:47:49 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild,v 1.7 2013/04/01 16:33:23 pinkbyte Exp $
inherit eutils autotools flag-o-matic multilib python
@@ -50,6 +50,9 @@ src_unpack() {
# Compability with current SOX (bug #250320)
epatch "${FILESDIR}/${P}-sox.patch"
+ # Compatibility with automake >= 1.11.2 (bug #424892)
+ epatch "${FILESDIR}/${P}-automake-1.11.patch"
+
# run autotools
eautoreconf
}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch b/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch
new file mode 100644
index 000000000000..4abd3265194b
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-automake-1.11.patch
@@ -0,0 +1,12 @@
+--- scripts/Makefile.am.orig 2012-07-05 14:10:56.725746439 +0200
++++ scripts/Makefile.am 2012-07-05 14:12:00.840861325 +0200
+@@ -1,7 +1,8 @@
+ spooldir = @localstatedir@/spool/capisuite
+ pkgsysconfdir = @sysconfdir@/capisuite
+
+-dist_pkglib_DATA = idle.py incoming.py README
++scriptdatadir=$(pkglibdir)
++dist_scriptdata_DATA = idle.py incoming.py README
+ python_module_DATA = cs_helpers.py
+ EXTRA_DIST = cs_helpers.pyin fax.confin answering_machine.confin capisuitefax.in
+