From 6c66a248dee028765b4f2f1a0c8a998a39ece978 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 18 Feb 2014 13:57:13 +0100 Subject: [PATCH] guile: fix -devel dependencies; added libguile subpkg and remove useless -doc subpkg. --- common/shlibs | 2 +- srcpkgs/guile/template | 29 ++++++++++++++--------------- srcpkgs/{guile-docs => libguile} | 0 3 files changed, 15 insertions(+), 16 deletions(-) rename srcpkgs/{guile-docs => libguile} (100%) diff --git a/common/shlibs b/common/shlibs index 6032aa0f190..02c9a201297 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1361,7 +1361,7 @@ libgda-ui-5.0.so.4 libgda-5.1.2_1 libgda-xslt-5.0.so.4 libgda-5.1.2_1 libdevhelp-3.so.2 devhelp-libs-3.8.2_1 libunistring.so.0 libunistring-0.9.3_1 -libguile-2.0.so.22 guile-2.0.9_1 +libguile-2.0.so.22 libguile-2.0.9_3 libopts.so.25 autogen-5.17.4_1 libanjuta-3.so.0 anjuta-3.8.4_1 libgmlib.so.1 gmtk-1.0.8_1 diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template index 320be58caec..596c1a731bc 100644 --- a/srcpkgs/guile/template +++ b/srcpkgs/guile/template @@ -1,35 +1,34 @@ # Template build file for 'guile'. pkgname=guile version=2.0.9 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --disable-error-on-warning" hostmakedepends="pkg-config texinfo" -makedepends="libltdl-devel libunistring-devel libffi-devel gc-devel ncurses-devel" +makedepends="gmp-devel libltdl-devel libunistring-devel libffi-devel gc-devel ncurses-devel" short_desc="A portable, embeddable Scheme implementation written in C" maintainer="davehome " license="GPL" homepage="http://www.gnu.org/software/${pkgname}" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=b24a112456702bf479395a1ac0b038fecafc8a252f6af798006312a7251315e7 -long_desc=" - Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official - extension language (Scheme) for the GNU operating system." + +replaces="guile-docs>=0" + +libguile_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} guile-devel_package() { - short_desc+=" (Development files)" - depends="guile" + short_desc+=" - development files" + depends="gmp-devel libguile>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/share/aclocal vmove usr/lib/pkgconfig - } -} - -guile-docs_package() { - short_desc+=" (Documentation)" - pkg_install() { - vmove usr/share/info - vmove usr/share/man + vmove "usr/lib/*.so" } } diff --git a/srcpkgs/guile-docs b/srcpkgs/libguile similarity index 100% rename from srcpkgs/guile-docs rename to srcpkgs/libguile