From 6295ad7ff71d1f6d5262f29482998f9dfa2cd9d0 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 30 Apr 2011 17:53:35 +0000 Subject: [PATCH] sys-fs/tdu: Fix deps for gnome3, Fix for asneeded svn path=/sunrise/; revision=12012 --- sys-fs/tdu/ChangeLog | 6 ++++- sys-fs/tdu/Manifest | 5 ++-- sys-fs/tdu/files/2008.05.07-asneeded.patch | 16 +++++++++++++ sys-fs/tdu/tdu-2008.05.07.ebuild | 27 ++++++++++------------ 4 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 sys-fs/tdu/files/2008.05.07-asneeded.patch diff --git a/sys-fs/tdu/ChangeLog b/sys-fs/tdu/ChangeLog index a42922796..10bb521f7 100644 --- a/sys-fs/tdu/ChangeLog +++ b/sys-fs/tdu/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sys-fs/tdu -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Apr 2011; Justin Lecher + +files/2008.05.07-asneeded.patch, tdu-2008.05.07.ebuild: + Fix deps for gnome3, Fix for asneeded + *tdu-2008.05.07 (11 May 2009) 11 May 2009; Justin Lecher (jlec) diff --git a/sys-fs/tdu/Manifest b/sys-fs/tdu/Manifest index bf6fcedb8..22a3357e0 100644 --- a/sys-fs/tdu/Manifest +++ b/sys-fs/tdu/Manifest @@ -1,5 +1,6 @@ AUX 2008.05.07-DESTDIR.patch 888 RMD160 5b7ad222d8a0c9da5ee794ee7a527bab51943d96 SHA1 520850c33835e51fb9d480daaafbca9bb313bcde SHA256 04d002a5fb86f778845378c8e44bf34173a8609294639ae46634603e60a46af6 +AUX 2008.05.07-asneeded.patch 460 RMD160 85bbc136895f0e21ac7e51620dabb43a01f9b33a SHA1 bcfab3a885657dbb835fd048a9d577d242762269 SHA256 8174eb233608ff8fc7acabe3a351f01f91221339c4f629218e2980a7f2cd6189 DIST tdu-2008-05-07.tar.gz 20466 RMD160 7bf5ab5afe0d19eaf1d4c27bd6735d44da624633 SHA1 0ac0873bfd17ea360f7cc27011c77ef606c9febd SHA256 df59d3cc3dda4dc5f85db8ce71b24842334c72bf4b8a501917c8df0a22511a1f -EBUILD tdu-2008.05.07.ebuild 816 RMD160 3bcaf30757033911b7445a512d62e4183edb6d56 SHA1 94e06ca2147ea0a4d074cabab0c96cac8390a686 SHA256 0b6eb0f05a53c24142a9d4b0157a080160187b186c452591536026af362a9053 -MISC ChangeLog 319 RMD160 6a48b55c81a444ad39b1823b85a2f2abd61cad21 SHA1 a78c8a9abc396c1f3552c33d2ac613430e000f5f SHA256 3232d7dc8c4aaf33bb18c92333e8f45d2682fd6b599c349887fa95b47fe8f777 +EBUILD tdu-2008.05.07.ebuild 702 RMD160 c81a9de28c8efb515822f875a8565b25e74516a8 SHA1 5afdb64e206da87b241d3ae884a5e90e4f959137 SHA256 38b75ac224dd0e71956ab68b205defccc0fbef6ea3aac72b18b190e22fceb252 +MISC ChangeLog 466 RMD160 f41e87d123e1ebd4ac50dc2fae1acbb065fa057a SHA1 b37221b0593830cc099992f54e88a3aad5b63215 SHA256 db40b5a44345833ce6134191bc94d8491d55642c54e2ff541924572829d32cf2 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f diff --git a/sys-fs/tdu/files/2008.05.07-asneeded.patch b/sys-fs/tdu/files/2008.05.07-asneeded.patch new file mode 100644 index 000000000..8b2d4734c --- /dev/null +++ b/sys-fs/tdu/files/2008.05.07-asneeded.patch @@ -0,0 +1,16 @@ + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 7912b11..b62cfba 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,7 @@ OBJS = $(SRCS:.c=.o) + LIBS = -lncurses + + $(program): $(OBJS) +- $(CC) `pkg-config --libs glib-2.0` $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) `pkg-config --libs glib-2.0` + + .c.o: + $(CC) `pkg-config --cflags glib-2.0` -Wall $(CFLAGS) -c $< -o $@ diff --git a/sys-fs/tdu/tdu-2008.05.07.ebuild b/sys-fs/tdu/tdu-2008.05.07.ebuild index c466730e6..278936806 100644 --- a/sys-fs/tdu/tdu-2008.05.07.ebuild +++ b/sys-fs/tdu/tdu-2008.05.07.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit versionator base toolchain-funcs +EAPI=4 + +inherit eutils versionator toolchain-funcs MY_P="${PN}-$(replace_all_version_separators - ${PV})" @@ -15,21 +17,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="sys-libs/ncurses - dev-libs/glib" +RDEPEND=" + sys-libs/ncurses + dev-libs/glib:2" DEPEND="${RDEPEND} dev-util/pkgconfig" S="${WORKDIR}"/${PN} -PATCHES=( "${FILESDIR}"/${PV}-DESTDIR.patch ) - -src_compile() { - emake \ - CC=$(tc-getCC) || \ - die "compilation failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "installation failed" - dodoc README TODO || die "nothing to read" +src_prepare() { + epatch \ + "${FILESDIR}"/${PV}-DESTDIR.patch \ + "${FILESDIR}"/${PV}-asneeded.patch + tc-export CC } -- 2.43.2