diff options
author | Rafael Martins <rafaelmartins@gentoo.org> | 2011-01-12 22:21:26 +0000 |
---|---|---|
committer | Rafael Martins <rafaelmartins@gentoo.org> | 2011-01-12 22:21:26 +0000 |
commit | 26234fe8791f886d097f3ac1f4491786f9afc922 (patch) | |
tree | 07f207828fae3c48bb0650c193abe35070c10ed9 /sci-electronics | |
parent | Version bump. Check for inotify in-kernel support (diff) | |
download | gentoo-2-26234fe8791f886d097f3ac1f4491786f9afc922.tar.gz gentoo-2-26234fe8791f886d097f3ac1f4491786f9afc922.tar.bz2 gentoo-2-26234fe8791f886d097f3ac1f4491786f9afc922.zip |
Revision bump. Fixed bug #351471, thanks to flameeyes.
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Diffstat (limited to 'sci-electronics')
-rw-r--r-- | sci-electronics/gsmc/ChangeLog | 8 | ||||
-rw-r--r-- | sci-electronics/gsmc/files/gsmc-1.1-autotools.patch | 49 | ||||
-rw-r--r-- | sci-electronics/gsmc/gsmc-1.1-r1.ebuild (renamed from sci-electronics/gsmc/gsmc-1.1.ebuild) | 15 |
3 files changed, 68 insertions, 4 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/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 |