From ce76cbac9c962442a0bc3c052018a8c8362c456a Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 19 Dec 2006 02:44:36 +0000 Subject: [PATCH] fix up the dependencies Package-Manager: portage-2.1.2_rc3-r6 --- net-news/blam/ChangeLog | 6 +++++- net-news/blam/Manifest | 16 +++++++-------- net-news/blam/blam-1.8.4_pre2.ebuild | 30 +++++++++++++++------------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/net-news/blam/ChangeLog b/net-news/blam/ChangeLog index e55a640ee561..fc01fb98147b 100644 --- a/net-news/blam/ChangeLog +++ b/net-news/blam/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-news/blam # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.36 2006/12/15 03:56:36 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.37 2006/12/19 02:44:36 compnerd Exp $ + + 19 Dec 2006; Saleem Abdulrasool + blam-1.8.4_pre2.ebuild: + Fix up deps, and update the mono dep as per bug #158353 *blam-1.8.4_pre2 (15 Dec 2006) diff --git a/net-news/blam/Manifest b/net-news/blam/Manifest index a415bc12dff2..bba99a198b4f 100644 --- a/net-news/blam/Manifest +++ b/net-news/blam/Manifest @@ -46,14 +46,14 @@ EBUILD blam-1.8.2-r2.ebuild 1349 RMD160 5d9d234699cee51811aae8cd85b58db6723b263e MD5 c7002c852ebec0ecb259d52f24a5e528 blam-1.8.2-r2.ebuild 1349 RMD160 5d9d234699cee51811aae8cd85b58db6723b263e blam-1.8.2-r2.ebuild 1349 SHA256 7248c1aae46414f8e9b540b9e95619b025a5943e4ae2ab1e0788a9760c80a0ba blam-1.8.2-r2.ebuild 1349 -EBUILD blam-1.8.4_pre2.ebuild 1365 RMD160 89fd392f835984f8626b2878b738450df167ac76 SHA1 76e48ea698fd2cae83176532d4562dfeefde61cf SHA256 d19fae5df84acd80354b5a88e19260d7b4bdaccd66b0e01d26a251693c60f73b -MD5 71b47cc9e8032c934c0b3fc32d5d673a blam-1.8.4_pre2.ebuild 1365 -RMD160 89fd392f835984f8626b2878b738450df167ac76 blam-1.8.4_pre2.ebuild 1365 -SHA256 d19fae5df84acd80354b5a88e19260d7b4bdaccd66b0e01d26a251693c60f73b blam-1.8.4_pre2.ebuild 1365 -MISC ChangeLog 5649 RMD160 60e0910bb4533bc3776fc80fbf15a34b331421cb SHA1 e27147a2706ddfb776c97764d098606ca2eaca3a SHA256 b2780d8121960a9c537ab81685623b52299c9fe5a041d9e955243ab4147c6094 -MD5 75b4fe10c135c8e18503641eafce61e2 ChangeLog 5649 -RMD160 60e0910bb4533bc3776fc80fbf15a34b331421cb ChangeLog 5649 -SHA256 b2780d8121960a9c537ab81685623b52299c9fe5a041d9e955243ab4147c6094 ChangeLog 5649 +EBUILD blam-1.8.4_pre2.ebuild 1477 RMD160 c548be2acad7483334bfc5e7ae1a313148616383 SHA1 7c7dcbf217c766d39e59bb6b00f174d756b34e89 SHA256 ab36b65c77fcdf2250f261578c15629d94ece0cbfbe0f97424b368583d7dc3db +MD5 a25cb805b81f40a895e2d5aac5d6b96b blam-1.8.4_pre2.ebuild 1477 +RMD160 c548be2acad7483334bfc5e7ae1a313148616383 blam-1.8.4_pre2.ebuild 1477 +SHA256 ab36b65c77fcdf2250f261578c15629d94ece0cbfbe0f97424b368583d7dc3db blam-1.8.4_pre2.ebuild 1477 +MISC ChangeLog 5791 RMD160 f367aba6d9afb6bbfc55b00507311bdc7960bfab SHA1 51d1493875385cab797430628c57c40267f20ed9 SHA256 4c1e983dbc4df2b2fcf3e9cf086b1c479a91eeafcfba8bf5803fde28017b0f76 +MD5 3cddcbd5fd598a84cdcf91fefbcacb08 ChangeLog 5791 +RMD160 f367aba6d9afb6bbfc55b00507311bdc7960bfab ChangeLog 5791 +SHA256 4c1e983dbc4df2b2fcf3e9cf086b1c479a91eeafcfba8bf5803fde28017b0f76 ChangeLog 5791 MISC metadata.xml 222 RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb SHA1 0adada1945fd52cf6649dbafddd2e4ebd84e3543 SHA256 2291d7f74fb8845472f5527edd49d2004d0626025dfc6622cbe6a8fe22dc846d MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222 RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb metadata.xml 222 diff --git a/net-news/blam/blam-1.8.4_pre2.ebuild b/net-news/blam/blam-1.8.4_pre2.ebuild index 7ecd3d2e6120..eb27dacf159d 100644 --- a/net-news/blam/blam-1.8.4_pre2.ebuild +++ b/net-news/blam/blam-1.8.4_pre2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.4_pre2.ebuild,v 1.1 2006/12/15 03:56:36 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.4_pre2.ebuild,v 1.2 2006/12/19 02:44:36 compnerd Exp $ inherit mono eutils autotools @@ -13,23 +13,30 @@ SRC_URI="http://www.cmartin.tk/blam/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" - IUSE="" -DEPEND=">=dev-lang/mono-1.1.4 - >=dev-dotnet/gtk-sharp-2.4 - >=dev-dotnet/gtk-sharp-2.4 + +RDEPEND=">=dev-lang/mono-1.1.17 + >=dev-dotnet/gtk-sharp-2.8.2 >=dev-dotnet/gconf-sharp-2.4 - >=dev-dotnet/glade-sharp-2.4 + >=dev-dotnet/glade-sharp-2.8.2 >=dev-dotnet/gecko-sharp-0.11-r1 + >=gnome-base/libgnomeui-2.2 >=gnome-base/gconf-2.4" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/pkgconfig-0.19 + >=dev-util/intltool-0.25" + +# Disable parallel builds +MAKEOPTS="$MAKEOPTS -j1" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} cd ${S} - if [ $(get_libdir) != "lib" ] ; then + if [[ "$(get_libdir)" != "lib" ]] ; then sed -i -e 's:$(prefix)/lib/blam:$(libdir)/blam:' \ -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ ${S}/{,lib,libblam,src}/Makefile.{in,am} ${S}/blam.in || die @@ -45,12 +52,7 @@ src_unpack() { eautomake } -src_compile() { - econf || die - emake -j1 || die -} - src_install() { - make DESTDIR=${D} install || die + make DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog INSTALL NEWS README TODO } -- 2.26.2