Fixes bugs #53796 - tcl depend and bug #45124 - config file improvement. Fixes 2.6 headers problem too

5 files changed, 88 insertions, 15 deletions

diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index 66a099bb3e46..4b9bad5f0bcb 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/isdn4k-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.19 2004/07/01 22:07:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.20 2004/09/24 02:14:45 dragonheart Exp $
+
+  24 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/3.2_p1-r4/pathfix.patch, +files/3.2_p1-r4/vbox-makefile.am.patch,
+  isdn4k-utils-3.2_p1-r4.ebuild:
+  Fixes bugs #53796 - tcl depend and bug #45124 - config file improvement.
+  Thanks to Georg Weiss <georg@georgweiss.de> and Frank Eichentopf
+  <frei@hap-bb.de>. Fixes 2.6 headers problem too.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   isdn4k-utils-3.2_p1-r2.ebuild, isdn4k-utils-3.2_p1-r3.ebuild,
diff --git a/net-dialup/isdn4k-utils/Manifest b/net-dialup/isdn4k-utils/Manifest
index 9756d4785796..1db45d6a41aa 100644
--- a/net-dialup/isdn4k-utils/Manifest
+++ b/net-dialup/isdn4k-utils/Manifest
@@ -1,20 +1,32 @@
-MD5 5bfcbc27dc20e18327b61f5df2bbec60 isdn4k-utils-3.2_p1-r3.ebuild 3070
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e54c5dc9f0c450e0cb75633f7aab7c4a ChangeLog 3365
 MD5 9f4187355b91c0dabfca1b251589f527 isdn4k-utils-3.2_p1-r2.ebuild 2808
-MD5 ab4d441287c72a40f24b0d068b45768b isdn4k-utils-3.2_p1-r4.ebuild 3218
-MD5 a39e65da22707925b096067b73b5e374 ChangeLog 3009
+MD5 5bfcbc27dc20e18327b61f5df2bbec60 isdn4k-utils-3.2_p1-r3.ebuild 3070
+MD5 f18a68edbe338cae044acc49ae9fdd2b isdn4k-utils-3.2_p1-r4.ebuild 3553
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977
 MD5 e2cc85397eb8ff285f383213ab00cdad files/digest-isdn4k-utils-3.2_p1-r2 73
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r3 136
 MD5 12a790e7cfe579394ff02019abcdf95d files/digest-isdn4k-utils-3.2_p1-r4 136
+MD5 2dbc97316fbe5d721b9701347464e22c files/gcc33-multiline.patch 1977
 MD5 adcc3c0ef100b737b0af224401812a4b files/local.start 564
+MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383
+MD5 2f4c186b729606b475e17a0ea54189c9 files/3.2_p1-r2/config 2405
 MD5 92412760dfacc81cfac908d522ac8e39 files/3.2_p1-r2/ioptions 86
+MD5 49ffb48689897498866cc14687831e08 files/3.2_p1-r2/ip-down.ippp0 228
+MD5 6ed9643d1d6b7e57adadee4dd28ea81a files/3.2_p1-r2/ip-up 115
 MD5 115bcf317b18a9c362ef37acf5cd4c4b files/3.2_p1-r2/isdn4linux.conf 105
 MD5 6e3cf010767d62855da0b5999511c59f files/3.2_p1-r2/isdn4linux.init 684
-MD5 6ed9643d1d6b7e57adadee4dd28ea81a files/3.2_p1-r2/ip-up 115
-MD5 7ce4e9c2bb9dee4d231ae8da54a06b9f files/3.2_p1-r2/gentoo.patch 2383
-MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.2_p1-r2/options.ippp0 443
-MD5 2f4c186b729606b475e17a0ea54189c9 files/3.2_p1-r2/config 2405
 MD5 5d46112f6ebccecdb14e2812d2e348f2 files/3.2_p1-r2/net.ippp0 2426
-MD5 49ffb48689897498866cc14687831e08 files/3.2_p1-r2/ip-down.ippp0 228
+MD5 48266d44ebe70519d3fc67a6b0e260ff files/3.2_p1-r2/options.ippp0 443
 MD5 0a638249458e39c304846ddd401e3fee files/3.2_p1-r4/config 2405
+MD5 56b93c0cc4cc17b12c6add0237283271 files/3.2_p1-r4/pathfix.patch 641
+MD5 15ef676fec91271f9a48dc7a1b7e82a2 files/3.2_p1-r4/vbox-makefile.am.patch 1211
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBU4N7mdTrptrqvGERAr9YAJ9s1CT9jLkPpuPKCS+FiW39ugTeiACgkFc8
+DZXN+1iQRnMc13kLbuRhjpw=
+=lNRU
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r4/pathfix.patch b/net-dialup/isdn4k-utils/files/3.2_p1-r4/pathfix.patch
new file mode 100644
index 000000000000..1b5c0bdd5d17
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r4/pathfix.patch
@@ -0,0 +1,20 @@
+--- isdn.conf.install   2004-03-19 13:53:59.000000000 +0100
++++ isdn.conf   2004-03-19 13:54:48.000000000 +0100
+@@ -24,12 +24,12 @@
+ CHARGEMAX       = 50.00
+ CURRENCY = 0.062,EUR
+
+-COUNTRYFILE = /usr/lib/isdn/country.dat
++COUNTRYFILE = /usr/share/isdn/country.dat
+ RATECONF= /etc/isdn/rate.conf
+-RATEFILE= /usr/lib/isdn/rate-de.dat
+-HOLIDAYS= /usr/lib/isdn/holiday-de.dat
+-ZONEFILE= /usr/lib/isdn/zone-de-%s.cdb
+-DESTFILE= /usr/lib/isdn/dest.cdb
++RATEFILE= /usr/share/isdn/rate-de.dat
++HOLIDAYS= /usr/share/isdn/holiday-de.dat
++ZONEFILE= /usr/share/isdn/zone-de-%s.cdb
++DESTFILE= /usr/share/isdn/dest.cdb
+
+ # providerselect
+ VBN = 010:01900
diff --git a/net-dialup/isdn4k-utils/files/3.2_p1-r4/vbox-makefile.am.patch b/net-dialup/isdn4k-utils/files/3.2_p1-r4/vbox-makefile.am.patch
new file mode 100644
index 000000000000..226262112f89
--- /dev/null
+++ b/net-dialup/isdn4k-utils/files/3.2_p1-r4/vbox-makefile.am.patch
@@ -0,0 +1,24 @@
+--- vboxgetty/examples/scripts/Makefile.am.orig	2004-09-24 11:14:08.044455472 +0930
++++ vboxgetty/examples/scripts/Makefile.am	2004-09-24 11:14:38.451386288 +0930
+@@ -14,6 +14,6 @@
+ ## Local install routines ################################################
+ 
+ install-data-local:
+-			  $(mkinstalldirs) $(pkgdatadir)/tcl
+-			  $(INSTALL) -m 644 initmodem.tcl $(pkgdatadir)/tcl/
+-			  $(INSTALL) -m 644 answercall.tcl $(pkgdatadir)/tcl/
++			  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/tcl
++			  $(INSTALL) -m 644 initmodem.tcl $(DESTDIR)$(pkgdatadir)/tcl/
++			  $(INSTALL) -m 644 answercall.tcl $(DESTDIR)$(pkgdatadir)/tcl/
+--- vboxgetty/examples/Makefile.am.orig	2004-09-24 11:27:49.756751152 +0930
++++ vboxgetty/examples/Makefile.am	2004-09-24 11:27:08.663145584 +0930
+@@ -18,6 +18,6 @@
+ ## Local install routines ################################################
+ 
+ install-data-local:
+-			  $(mkinstalldirs) $(sysconfdir)
+-			  $(INSTALL) -m 664 vboxgetty.conf $(sysconfdir)
+-			  $(INSTALL) -m 664 vboxcallerid.conf $(sysconfdir)
++			  $(mkinstalldirs) $(DESTDIR)/$(sysconfdir)
++			  $(INSTALL) -m 664 vboxgetty.conf $(DESTDIR)/$(sysconfdir)
++			  $(INSTALL) -m 664 vboxcallerid.conf $(DESTDIR)/$(sysconfdir)
diff --git a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild
index 08d12b3c42b8..e93930a17d22 100644
--- a/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild
+++ b/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild,v 1.6 2004/07/01 22:07:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/isdn4k-utils-3.2_p1-r4.ebuild,v 1.7 2004/09/24 02:14:45 dragonheart Exp $
 
 inherit eutils
 
@@ -22,9 +22,9 @@ RDEPEND=">=sys-apps/portage-2.0.47-r10
 	virtual/libc
 	sys-libs/ncurses
 	sys-libs/gdbm
+	dev-lang/tcl
 	X? (
 		virtual/x11
-		dev-lang/tcl
 	)"
 
 DEPEND="${RDEPEND}
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+
 	# Get country code from I4L_CC variable
 	# default country: DE (Germany)
 	export I4L_CC=`echo -n "${I4L_CC}" | tr "[:lower:]" "[:upper:]"`
@@ -41,8 +42,11 @@ src_unpack() {
 	export I4L_CC_LOW=`echo -n "${I4L_CC}" | tr "[:upper:]" "[:lower:]"`
 	cd ${S}
 
+	# fix for 2.6 headers
+	find . -name \*.c | xargs sed -i -e 's:linux/capi.h>$:linux/compiler.h>\n#include <linux/capi.h>:g'
+
 	# Patch .config file to suit our needs
-	cat ${FILESDIR}/${PV}-r4/config | { \
+	cat ${FILESDIR}/${PVR}/config | { \
 		if use X >/dev/null; then
 			cat
 		else
@@ -69,7 +73,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/gcc33-multiline.patch
 
-	for x in capi20 capiinfo capiinit
+	for x in capi20 capiinfo capiinit ../vbox3-${VBOX_V}
 	do
 		cd ${S}/${x}
 		[ -f ltmain.sh ] && libtoolize --force
@@ -78,6 +82,9 @@ src_unpack() {
 		automake --add-missing
 		autoconf
 	done
+
+	cd ${WORKDIR}/vbox3-${VBOX_V}
+	epatch ${FILESDIR}/${PVR}/vbox-makefile.am.patch || die "failed to patch"
 }
 
 src_compile() {
@@ -114,7 +121,10 @@ src_install() {
 	doins options.ippp0
 
 	cd ${S}/../vbox3-${VBOX_V}
-	einstall || die
+	emake DESTDIR=${D} install || die
+
+	cd ${D}/etc/isdn
+	epatch ${FILESDIR}/${PVR}/pathfix.patch || die
 }
 
 pkg_postinst() {