Fix build issue, bug#201021, thanks to Max Loparyev

(Portage version: 2.1.4_rc9)

4 files changed, 97 insertions, 1 deletions

diff --git a/dev-tcltk/tclgpgme/ChangeLog b/dev-tcltk/tclgpgme/ChangeLog
index 81c3787badf6..04171cd5197a 100644
--- a/dev-tcltk/tclgpgme/ChangeLog
+++ b/dev-tcltk/tclgpgme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tclgpgme
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclgpgme/ChangeLog,v 1.25 2007/11/10 17:02:23 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclgpgme/ChangeLog,v 1.26 2007/12/13 21:35:35 alonbl Exp $
+
+*tclgpgme-1.0-r3 (13 Dec 2007)
+
+  13 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/tclgpgme-1.0-build.patch, +tclgpgme-1.0-r3.ebuild:
+  Fix build issue, bug#201021, thanks to Max Loparyev
 
   10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> -tclgpgme-1.0-r1.ebuild:
   Cleanup
diff --git a/dev-tcltk/tclgpgme/files/digest-tclgpgme-1.0-r3 b/dev-tcltk/tclgpgme/files/digest-tclgpgme-1.0-r3
new file mode 100644
index 000000000000..aa69169ebed9
--- /dev/null
+++ b/dev-tcltk/tclgpgme/files/digest-tclgpgme-1.0-r3
@@ -0,0 +1,3 @@
+MD5 a718a6ee2ac65e79437c5d09a7382ce8 tclgpgme-1.0.tgz 188026
+RMD160 090de602739edc178db0c7315c8adcfd90b78381 tclgpgme-1.0.tgz 188026
+SHA256 63b7ad3a21f1b66ab05737922b8edf58368d0d79b2596f230ee9dce6e96ea24a tclgpgme-1.0.tgz 188026
diff --git a/dev-tcltk/tclgpgme/files/tclgpgme-1.0-build.patch b/dev-tcltk/tclgpgme/files/tclgpgme-1.0-build.patch
new file mode 100644
index 000000000000..9255f20078a4
--- /dev/null
+++ b/dev-tcltk/tclgpgme/files/tclgpgme-1.0-build.patch
@@ -0,0 +1,51 @@
+diff -urNp tclgpgme-1.0.org/configure.in tclgpgme-1.0/configure.in
+--- tclgpgme-1.0.org/configure.in	2002-09-25 22:49:42.000000000 +0300
++++ tclgpgme-1.0/configure.in	2007-12-08 13:04:41.000000000 +0200
+@@ -12,8 +12,9 @@
+ # AC_INIT(../generic/tcl.h)
+ #--------------------------------------------------------------------
+ 
+-AC_INIT(tclgpgme.c)
++AC_INIT(tclgpgme.c,1.0)
+ AC_CONFIG_AUX_DIR(config)
++AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
+ CONFIGDIR=${srcdir}/config
+ AC_SUBST(CONFIGDIR)
+ AC_PROG_CC
+@@ -273,7 +274,7 @@ AC_SUBST(SHLIB_LD_LIBS)
+ 
+ SC_PROG_TCLSH
+ 
+-PKG_TCL=${TCL_PACKAGE_PATH}/gpgme-${VERSION}
++PKG_TCL=${TCL_PACKAGE_PATH%% *}/gpgme-${VERSION}
+ AC_SUBST(PKG_TCL)
+ 
+ #--------------------------------------------------------------------
+diff -urNp tclgpgme-1.0.org/Makefile.am tclgpgme-1.0/Makefile.am
+--- tclgpgme-1.0.org/Makefile.am	2002-08-30 09:48:32.000000000 +0300
++++ tclgpgme-1.0/Makefile.am	2007-12-08 13:01:27.000000000 +0200
+@@ -1,7 +1,7 @@
+ # Makefile.am for the Tcl gpgme extension
+ # 
+ 
+-LIB_TCL		= @TCL_LIB_SPEC@ @GPGME_LIBS@
++LIB_TCL		= @TCL_STUB_LIB_SPEC@ @GPGME_LIBS@
+ 
+ tclgpgme_version = 1:0:0
+ 
+@@ -17,11 +17,11 @@ libtclgpgme_la_DEPENDENCIES = 
+ libtclgpgme_la_LIBADD = $(LIB_TCL)
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) @PKG_TCL@
++	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
+ 	echo	"package ifneeded gpgme"				   \
+ 		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
+-		"[list load $(DESTDIR)$(libdir)/libtclgpgme.so]"	   \
+-	    > @PKG_TCL@/pkgIndex.tcl
++		"[list load $(libdir)/libtclgpgme.so]"	   \
++	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
+ 	sed -e 's%load .libs/libtclgpgme.so%package require gpgme%' \
+ 	    < test.tcl						    \
+-	    > @PKG_TCL@/test.tcl
++	    > $(DESTDIR)@PKG_TCL@/test.tcl
diff --git a/dev-tcltk/tclgpgme/tclgpgme-1.0-r3.ebuild b/dev-tcltk/tclgpgme/tclgpgme-1.0-r3.ebuild
new file mode 100644
index 000000000000..4246adf14745
--- /dev/null
+++ b/dev-tcltk/tclgpgme/tclgpgme-1.0-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclgpgme/tclgpgme-1.0-r3.ebuild,v 1.1 2007/12/13 21:35:35 alonbl Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Tcl/Tk libraries to gpgme."
+HOMEPAGE="http://beepcore-tcl.sourceforge.net/"
+SRC_URI="http://beepcore-tcl.sourceforge.net/${P}.tgz"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/tcl-8.3.3
+	>=dev-lang/tk-8.3.3
+	=app-crypt/gpgme-0.3.14-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-build.patch"
+	AT_M4DIR="config" eautoreconf
+}
+
+src_compile() {
+	export GPGME_CONFIG=/usr/bin/gpgme3-config
+	econf --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS INSTALL README
+}