Convert to EAPI=2. Run autoreconf. Do not DEPEND on system packages. Set RDEPEND. Use CFLAGS. Remove separator comments. Apply Debian patch to build on amd64. Marked ~hppa too.

(Portage version: 2.2_rc31/cvs/Linux i686)

4 files changed, 55 insertions, 19 deletions

diff --git a/net-misc/smbc/ChangeLog b/net-misc/smbc/ChangeLog
index 43ed86882f81..dab1da34021c 100644
--- a/net-misc/smbc/ChangeLog
+++ b/net-misc/smbc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/smbc
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/ChangeLog,v 1.6 2007/02/22 02:47:51 peper Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/ChangeLog,v 1.7 2009/04/28 17:13:08 jer Exp $
+
+  28 Apr 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/smbc-1.2.2-cflags.patch, +files/smbc-1.2.2-size_t.patch,
+  smbc-1.2.2.ebuild:
+  Convert to EAPI=2. Run autoreconf. Do not DEPEND on system packages. Set
+  RDEPEND. Use CFLAGS. Remove separator comments. Apply Debian patch to
+  build on amd64. Marked ~hppa too.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/smbc/files/smbc-1.2.2-cflags.patch b/net-misc/smbc/files/smbc-1.2.2-cflags.patch
new file mode 100644
index 000000000000..f0125f7ca756
--- /dev/null
+++ b/net-misc/smbc/files/smbc-1.2.2-cflags.patch
@@ -0,0 +1,13 @@
+Do not define CFLAGS
+
+--- smbc-1.2.2/src/Makefile.am.orig	2005-06-29 14:14:02.000000000 +0200
++++ smbc-1.2.2/src/Makefile.am	2009-04-28 18:18:26.000000000 +0200
+@@ -18,7 +18,7 @@
+               smb-ext.c smb-ext.h
+ 
+ smbc_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wall
+-CFLAGS = -O3
++#CFLAGS = -O3
+ 
+ if GDB
+   smbc_CFLAGS += -ggdb -g
diff --git a/net-misc/smbc/files/smbc-1.2.2-size_t.patch b/net-misc/smbc/files/smbc-1.2.2-size_t.patch
new file mode 100644
index 000000000000..e423bec1deaf
--- /dev/null
+++ b/net-misc/smbc/files/smbc-1.2.2-size_t.patch
@@ -0,0 +1,16 @@
+Patch to enable running on amd64 (borrowed from http://bugs.debian.org/366580)
+
+--- smbc-1.2.2.orig/src/convert.c
++++ smbc-1.2.2/src/convert.c
+@@ -98,8 +98,9 @@
+ 
+   char *inbuf  = (char*) src;
+   char *outbuf = param->dst;
+-  int  inbytesleft  = src_len - 1;
+-  int  outbytesleft = param->dst_len - 1;
++  /* iconv requires size_t and not int ! */
++  size_t  inbytesleft  = src_len - 1;
++  size_t  outbytesleft = param->dst_len - 1;
+   bzero(param->dst, param->dst_len);
+   // Need some error handling here
+   iconv(param->cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
diff --git a/net-misc/smbc/smbc-1.2.2.ebuild b/net-misc/smbc/smbc-1.2.2.ebuild
index 165e847f564c..9c674c60e763 100644
--- a/net-misc/smbc/smbc-1.2.2.ebuild
+++ b/net-misc/smbc/smbc-1.2.2.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/smbc-1.2.2.ebuild,v 1.2 2007/07/12 02:52:16 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/smbc/smbc-1.2.2.ebuild,v 1.3 2009/04/28 17:13:08 jer Exp $
+
+EAPI="2"
+
+inherit autotools
 
 DESCRIPTION="A text mode (ncurses) SMB network commander. Features: resume and UTF-8"
 HOMEPAGE="http://smbc.airm.net/en/index.php"
@@ -8,25 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~hppa ~ppc ~x86"
 IUSE="nls debug"
 
-DEPEND="sys-devel/gcc
-	net-fs/samba
-	>=sys-devel/automake-1.8
+DEPEND="net-fs/samba
 	sys-libs/ncurses
 	dev-libs/popt
 	nls? ( sys-devel/gettext )"
-#----------------------------------------------------------------------------
-src_compile() {
-	local myconf=""
-	use nls && myconf="${myconf} `use_enable nls`"
-	use debug && myconf="${myconf} --with-debug"
-	econf  ${myconf} || die "Configuration failed"
-	einfo "Configuration: ${myconf}"
-	emake || die "Make failed"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-size_t.patch
+	eautoreconf
 }
-#----------------------------------------------------------------------------
-src_install() {
-	emake DESTDIR=${D} install || die
+
+src_configure() {
+	econf $(use_enable nls) $(use_with debug) || die "econf failed"
 }