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

Package-Manager: portage-2.1.4_rc9

5 files changed, 112 insertions, 5 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/Manifest b/dev-tcltk/tclgpgme/Manifest
index a905a4d27eb9..482fd7a6c4f0 100644
--- a/dev-tcltk/tclgpgme/Manifest
+++ b/dev-tcltk/tclgpgme/Manifest
@@ -6,15 +6,23 @@ AUX 1.0-configure.diff 396 RMD160 022b30117b892fe5758c50b7d73166596c653449 SHA1
 MD5 0d24e55677e2576958cbf5758b0250b3 files/1.0-configure.diff 396
 RMD160 022b30117b892fe5758c50b7d73166596c653449 files/1.0-configure.diff 396
 SHA256 a9f54d1c0a5ecaf4bd24450cb6dcc4032e1a82e5eba421bd8f4a49e026db35b0 files/1.0-configure.diff 396
+AUX tclgpgme-1.0-build.patch 1759 RMD160 b496462dbea7708c4d8af47c81baef5f32429572 SHA1 c5e6c8044fe0f440a972ea839d53aa6fc7ebe0d7 SHA256 e0d8e430f16ddd1ed8b14a7c3ecbb22389e0087741f0d6f76e28a1e94302c36e
+MD5 34c2cd2788ca4860416aefeb8c0c95d8 files/tclgpgme-1.0-build.patch 1759
+RMD160 b496462dbea7708c4d8af47c81baef5f32429572 files/tclgpgme-1.0-build.patch 1759
+SHA256 e0d8e430f16ddd1ed8b14a7c3ecbb22389e0087741f0d6f76e28a1e94302c36e files/tclgpgme-1.0-build.patch 1759
 DIST tclgpgme-1.0.tgz 188026 RMD160 090de602739edc178db0c7315c8adcfd90b78381 SHA1 efcb89ab82944e1f4d60c033a4f26c6c10c89141 SHA256 63b7ad3a21f1b66ab05737922b8edf58368d0d79b2596f230ee9dce6e96ea24a
 EBUILD tclgpgme-1.0-r2.ebuild 904 RMD160 0378654baf12581764b2e0a64d054a1eb3ff21e9 SHA1 cb1b9a81e926c3ee58fab77f3663fafba43bb0c3 SHA256 15242970db8cb442eb3891f2f8ea7bf2a30112603c91e1f4e5186c9c4a84bdec
 MD5 b9a4770fc9c13e1d00a9be18b8b975bc tclgpgme-1.0-r2.ebuild 904
 RMD160 0378654baf12581764b2e0a64d054a1eb3ff21e9 tclgpgme-1.0-r2.ebuild 904
 SHA256 15242970db8cb442eb3891f2f8ea7bf2a30112603c91e1f4e5186c9c4a84bdec tclgpgme-1.0-r2.ebuild 904
-MISC ChangeLog 2810 RMD160 410cbcdac7c05dc75d6b0abd26c987783f9b95e1 SHA1 6cf0fb2aa4383d823bea2be0e678e802ce1e2385 SHA256 8f5f46225bcb498734c2ab08b94ddd13cd6b33d1fc652fe17dfd5b7ae27592b3
-MD5 05bb6f019aca34e856957b3179ed31b9 ChangeLog 2810
-RMD160 410cbcdac7c05dc75d6b0abd26c987783f9b95e1 ChangeLog 2810
-SHA256 8f5f46225bcb498734c2ab08b94ddd13cd6b33d1fc652fe17dfd5b7ae27592b3 ChangeLog 2810
+EBUILD tclgpgme-1.0-r3.ebuild 903 RMD160 e39789888ef2baf4e7c719c58ada15ac8f82e060 SHA1 8251e6c6d8b004e4d7d5115a96eba515f221dbdb SHA256 e5d13ae7a371bc0ee9d865a79710f4f80e946e9e655ac2c70790e4d417054ddd
+MD5 cb7a22b4dbf0b890758cd0afc3262a79 tclgpgme-1.0-r3.ebuild 903
+RMD160 e39789888ef2baf4e7c719c58ada15ac8f82e060 tclgpgme-1.0-r3.ebuild 903
+SHA256 e5d13ae7a371bc0ee9d865a79710f4f80e946e9e655ac2c70790e4d417054ddd tclgpgme-1.0-r3.ebuild 903
+MISC ChangeLog 3005 RMD160 942b086b2126193681803584d5451adcb89dbf0e SHA1 12bea256226b0c8a335f828710eacaa91dc3c53c SHA256 70d0e26771cec07b0124a236ef44787c82ff0451e0ce21d0253d4a3c2fb61c4f
+MD5 d46582d905b6f58b39c579a35840789f ChangeLog 3005
+RMD160 942b086b2126193681803584d5451adcb89dbf0e ChangeLog 3005
+SHA256 70d0e26771cec07b0124a236ef44787c82ff0451e0ce21d0253d4a3c2fb61c4f ChangeLog 3005
 MISC metadata.xml 322 RMD160 9a7de887651a70d15b0b66fb8e0e386745919e7d SHA1 8cdab8bc01ed70274e4c883f23d839431c31b643 SHA256 638a2464bbe82c27624dafbd3acc991271cb6e1c4bbbab837d8c0bc330ec01aa
 MD5 a5b6e338682ae5b8d1b1804d4eb3e9cd metadata.xml 322
 RMD160 9a7de887651a70d15b0b66fb8e0e386745919e7d metadata.xml 322
@@ -22,3 +30,6 @@ SHA256 638a2464bbe82c27624dafbd3acc991271cb6e1c4bbbab837d8c0bc330ec01aa metadata
 MD5 f744c9804d05970e74de6eeb78e86020 files/digest-tclgpgme-1.0-r2 229
 RMD160 bcb77b5336dbf90ae2bd7acc778c923ad71319d6 files/digest-tclgpgme-1.0-r2 229
 SHA256 c1f9430c7c643d08fdb1737599ade0a0b534bc45dfb505f043e674561124e95a files/digest-tclgpgme-1.0-r2 229
+MD5 f744c9804d05970e74de6eeb78e86020 files/digest-tclgpgme-1.0-r3 229
+RMD160 bcb77b5336dbf90ae2bd7acc778c923ad71319d6 files/digest-tclgpgme-1.0-r3 229
+SHA256 c1f9430c7c643d08fdb1737599ade0a0b534bc45dfb505f043e674561124e95a files/digest-tclgpgme-1.0-r3 229
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
+}