Revision bump. Fixed bug #351471, thanks to flameeyes.

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 71 insertions, 6 deletions

diff --git a/sci-electronics/gsmc/ChangeLog b/sci-electronics/gsmc/ChangeLog
index 9c6e9731fc85..4ff30d72f117 100644
--- a/sci-electronics/gsmc/ChangeLog
+++ b/sci-electronics/gsmc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/gsmc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gsmc/ChangeLog,v 1.1 2011/01/02 15:59:14 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gsmc/ChangeLog,v 1.2 2011/01/12 22:21:26 rafaelmartins Exp $
+
+*gsmc-1.1-r1 (12 Jan 2011)
+
+  12 Jan 2011; Rafael G. Martins <rafaelmartins@gentoo.org> -gsmc-1.1.ebuild,
+  +gsmc-1.1-r1.ebuild, +files/gsmc-1.1-autotools.patch:
+  Revision bump. Fixed bug #351471, thanks to flameeyes.
 
 *gsmc-1.1 (02 Jan 2011)
 
diff --git a/sci-electronics/gsmc/Manifest b/sci-electronics/gsmc/Manifest
index 025946924eb6..f9a94c0178bb 100644
--- a/sci-electronics/gsmc/Manifest
+++ b/sci-electronics/gsmc/Manifest
@@ -1,4 +1,5 @@
+AUX gsmc-1.1-autotools.patch 1369 RMD160 44ecd4949d8d2a22d653bb0bcaf19496d50f3ac1 SHA1 44bf9faae491d5dcc2753cf1c58ecd4157f28894 SHA256 7beb6aee0998f98b969963ac0762bed640dfec8b8a3ad216e1386aa0a8a5f0f8
 DIST gsmc-1.1.tar.gz 122726 RMD160 80406e224b485d24fe3d0505a8cb861f39b1fa31 SHA1 781f0c51ebe041419071703b8102e56536b47418 SHA256 3cd7fa7fb8712f878229e085ac8881bd829893da31dce96c3e98118798d63fda
-EBUILD gsmc-1.1.ebuild 639 RMD160 619101a88bb50bf4267e50dd84e273d563ba823f SHA1 a567b4c83d27320eff8068d21f3840b7085d597b SHA256 8ea588e99c492839f13690bd89ec9bcc2f97d571457eb5a6d4f980d3bef81bca
-MISC ChangeLog 376 RMD160 a5baf915130a349058872ae7f379cd03b2e2e7d7 SHA1 8bf3502a49100987d8f2e0b307dd0e3a007144d9 SHA256 4a8d83712860e3504ffd35292baf63399c751120f2c8f887c635dbb78ce73a8e
+EBUILD gsmc-1.1-r1.ebuild 792 RMD160 907bc47593b125ef1e44afed5ab24d8e1e75f799 SHA1 26ecb57e87f35b016c3889820719023cd0afc863 SHA256 46e4774ff943d882aefb26c93727932b68de9610e0be18be18f551124da15108
+MISC ChangeLog 603 RMD160 24a47c1dff4186632bbcdb3362303936476aa5dc SHA1 f511e0b514addf359a0029b58abd1151c32fc553 SHA256 1c28f77faffe34889abff7afad601f04d7cd38d916746f71182b2ebe3d248d44
 MISC metadata.xml 168 RMD160 02ffa2a6bfc173f6a601931fc931eb411d1f1a07 SHA1 caa9701abcacc8b45314ce04b0a8ebc5f04dfc09 SHA256 182df1c85b4fe43ec45658071ebe6cf7f23cc51288ea2e14ea46f7c5b1391e6f
diff --git a/sci-electronics/gsmc/files/gsmc-1.1-autotools.patch b/sci-electronics/gsmc/files/gsmc-1.1-autotools.patch
new file mode 100644
index 000000000000..cc155cd629ea
--- /dev/null
+++ b/sci-electronics/gsmc/files/gsmc-1.1-autotools.patch
@@ -0,0 +1,49 @@
+--- gsmc-1.1.orig/configure.ac	2011-01-12 18:14:55.633360421 -0200
++++ gsmc-1.1/configure.ac	2011-01-12 19:58:12.617251642 -0200
+@@ -7,26 +7,13 @@
+ AM_INIT_AUTOMAKE(gsmc, 1.0, ik5nax@amsat.org)
+ 
+ # Checks for programs.
+-AC_PROG_CC
+-pkg_modules="gtk+-2.0"
+-PKG_CHECK_MODULES(PACKAGE,[$pkg_modules])
++AM_PROG_CC_C_O
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ 
+ # Checks for libraries.
+-LIBS=" "
+-PKG_LIB2=`pkg-config --libs gtk+-2.0`
+-PKG_LIB=""
+-for i in $PKG_LIB2 ; do
+-        case $i in 
+-                -l*) PKG_LIB="$i $PKG_LIB" ;;
+-                -L*) LIBS="$i $LIBS" ;;
+-        esac
+-done
+-for i in $PKG_LIB ; do
+-        j=${i#'-l'}
+-        AC_CHECK_LIB($j,main)
+-done
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([GTK], [gtk+-2.0])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+
+--- gsmc-1.1.orig/Makefile.am	2011-01-12 18:14:55.633360421 -0200
++++ gsmc-1.1/Makefile.am	2011-01-12 18:52:46.741154884 -0200
+@@ -2,8 +2,9 @@
+      
+ bin_PROGRAMS=gsmc
+ gsmc_SOURCES= autotune.c calc.c dataconv.c draw.c main.c print.c widget.c autotune.h calc.h dataconv.h draw.h main.h print.h widget.h
+-INCLUDES=@PACKAGE_CFLAGS@
+-LIBS=@PACKAGE_LIBS@
++gsmc_CFLAGS = $(AM_CFLAGS) $(GTK_CFLAGS)
++gsmc_LDFLAGS = $(AM_LDFLAGS) $(GTK_LDFLAGS)
++gsmc_LDADD = $(AM_LDADD) $(GTK_LIBS)
+ 
+ EXTRA_DIST=gsmc.1.in gtkrc TODO
+-man_MANS=gsmc.1
+\ No newline at end of file
++man_MANS=gsmc.1
diff --git a/sci-electronics/gsmc/gsmc-1.1.ebuild b/sci-electronics/gsmc/gsmc-1.1-r1.ebuild
index 45c76320a655..d82cb4916da3 100644
--- a/sci-electronics/gsmc/gsmc-1.1.ebuild
+++ b/sci-electronics/gsmc/gsmc-1.1-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gsmc/gsmc-1.1.ebuild,v 1.1 2011/01/02 15:59:14 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gsmc/gsmc-1.1-r1.ebuild,v 1.1 2011/01/12 22:21:26 rafaelmartins Exp $
 
 EAPI="2"
 
+inherit autotools eutils
+
 DESCRIPTION="A GTK program for doing Smith Chart calculations"
 HOMEPAGE="http://www.qsl.net/ik5nax/"
 SRC_URI="http://www.qsl.net/ik5nax/${P}.tar.gz"
@@ -13,9 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-libs/glib
+CDEPEND="dev-libs/glib
 	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-autotools.patch"
+	eautoreconf
+}
 
 src_install() {
 	make DESTDIR="${D}" install || die