# HG changeset patch # User Binki # Date 2009-12-28 22:49:09 # Node ID 0c7400cc2ff604e6af84fb5dd82bafde250fa4ef # Parent b44bcfc466a95a32a04118855a520cdb81c8bd9b dev-libs/liblist: updated to compatibility with upstream which uses autotools. fixed HOMEPAGE. diff --git a/dev-libs/liblist/ChangeLog b/dev-libs/liblist/ChangeLog --- a/dev-libs/liblist/ChangeLog +++ b/dev-libs/liblist/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/liblist/ChangeLog,v 1.2 2009/12/05 22:32:30 nerdboy Exp $ + 29 Dec 2009; Nathan Phillip Brink (ohnobinki) + liblist-9999.ebuild, + -files/liblist-9999-sharedlib.patch: + Simplified and compatible with newer Mercurial (Remove patch, let + autotools install files). Fixed HOMEPAGE URL. + 23 Dec 2009; Nathan Phillip Brink (ohnobinki) liblist-9999.ebuild: Fix installation of the cache manpage. diff --git a/dev-libs/liblist/Manifest b/dev-libs/liblist/Manifest --- a/dev-libs/liblist/Manifest +++ b/dev-libs/liblist/Manifest @@ -1,4 +1,3 @@ -AUX liblist-9999-sharedlib.patch 1470 RMD160 c875b98f2262219521fffedd5e4874fcfca5152d SHA1 d1fbf99578d86cb3f4f35c1271421fb961607273 SHA256 968d9f115409cbde81b6fd90a8f3cf3821627a4a5a81f38d890e4cde87b6a9b9 -EBUILD liblist-9999.ebuild 1765 RMD160 8e7d375414bcfbe53a21a75e87d189fec06474b8 SHA1 a02cb0b2dc5040ff5377ba44103518efff6ba60a SHA256 7f5fcd5c7d5ddc08de9437c8003cb99b519aae97bd8011c40d47869500e68c57 +EBUILD liblist-9999.ebuild 1232 RMD160 dd4a888409f41ed34613c6cecf9ca76e85b984b8 SHA1 d3bd2b538320fef2f912a7141d9e6f917bc01922 SHA256 089756aaec4516e7ba27ee59f411c26d2c7a3925ad1bf8ad5dfa94d00302de46 MISC ChangeLog 1272 RMD160 0e51d6b1016851da2f86073ded51980bf987963a SHA1 b7b06f3f7be32719c40365b29c402d8e4b278b3c SHA256 46a9bf80386ea4f342160fb0bac50d1133a1860554b599adb9398beed97a32b2 MISC metadata.xml 473 RMD160 97667dfa400a624c3ba66fbaefa5bb5bf592c485 SHA1 8ab2e330cbc7993d95c0492ae14540ab5e0177ac SHA256 197f1543dd37a80c8de5ee4083d4eb659c8be038483895e11225c68e93da11f1 diff --git a/dev-libs/liblist/files/liblist-9999-sharedlib.patch b/dev-libs/liblist/files/liblist-9999-sharedlib.patch deleted file mode 100644 --- a/dev-libs/liblist/files/liblist-9999-sharedlib.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- Makefile.orig 2009-11-27 12:04:33.000000000 -0800 -+++ Makefile 2009-11-27 12:11:47.786739617 -0800 -@@ -25,19 +25,39 @@ - - LIBS = -L. -llist - #LIBS = -L . -llist # Use this for HP-UX; great loader guys! -+CC = cc -+LD = cc - MANDIR = /usr/share/man - LIBDIR = /usr/lib - INCDIR = /usr/include - - #add macro for ranlib 4/96 *kob* - ranlib doesn't exist on solaris - RANLIB = ls -+LN = ln -s -+ -+# try making shared lib (SLA 11/2009) -+SHARED = liblist.so -+LDFLAGS += -L$(LIBDIR) -+MKOBJ = $(CC) -fPIC -c list.c -I$(INCDIR) -+MKSO = -shared -Wl,-soname,$(SHARED) -+SOVER = 0.0 - --all: liblist.a -+all: liblist.a liblist.so - (cd examples; make) - - liblist.a: list.o -+ @echo "Making static lib ..." - ar rc liblist.a list.o - $(RANLIB) liblist.a -+ @echo "done" -+ -+liblist.so: list.o -+ @echo "Making shared lib $(SHARED) ..." -+ $(MKOBJ) -I. -+ $(LD) -I. $(MKSO) list.o -o $(SHARED).$(SOVER) $(LDFLAGS) -+ $(LN) $(SHARED).$(SOVER) $(SHARED).0 -+ $(LN) $(SHARED).$(SOVER) $(SHARED) -+ @echo "done" - - list.o: list.h list.3 Makefile - -@@ -62,6 +80,7 @@ - install: - install -c liblist.a $(DESTDIR)$(LIBDIR) - $(RANLIB) $(DESTDIR)$(LIBDIR)/liblist.a -+ install -c liblist.so $(DESTDIR)$(LIBDIR) - install -c list.h $(DESTDIR)$(INCDIR) - install -c queue.h $(DESTDIR)$(INCDIR) - install -c stack.h $(DESTDIR)$(INCDIR) -@@ -73,5 +92,5 @@ - install -c stack.3 $(DESTDIR)$(MANDIR)/man3 - - clean: -- rm -f *.o *.a core -+ rm -f *.o *.a *.so core - (cd examples; make clean) diff --git a/dev-libs/liblist/liblist-9999.ebuild b/dev-libs/liblist/liblist-9999.ebuild --- a/dev-libs/liblist/liblist-9999.ebuild +++ b/dev-libs/liblist/liblist-9999.ebuild @@ -4,10 +4,10 @@ EAPI="2" -inherit eutils mercurial toolchain-funcs +inherit autotools mercurial DESCRIPTION="This package provides generic linked-list manipulation routines, plus queues and stacks." -HOMEPAGE="http://ohnopub.net/hg/liblist/-unbased" +HOMEPAGE="http://ohnopub.net/hg/liblist-unbased" SRC_URI="" EHG_REPO_URI="http://ohnopub.net/hg/liblist-unbased" @@ -19,40 +19,25 @@ IUSE="doc examples" S=${WORKDIR}/${PN}-unbased src_prepare() { - epatch "${FILESDIR}"/${P}-sharedlib.patch - sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" Makefile \ - examples/cache/Makefile || die "sed 1 failed" + eautoreconf } -src_compile() { - make CC="$(tc-getCC)" LD="$(tc-getCC)" \ - || die "make failed" +src_configure() { + econf $(use_enable doc docs) \ + $(use_enable examples) } src_install() { - newman list.3 llist.3 || die - newman stack.3 lstack.3 || die - newman queue.3 lqueue.3 || die - dolib.a ${PN}.a || die - dolib.so ${PN}.so* || die - insinto /usr/include - doins list.h queue.h stack.h || die + emake DESTDIR="${D}" install || die + dodoc README || die if use examples; then - dolib.a examples/cache/libcache.a || die - dobin examples/cache/cachetest || die - newman examples/cache/cache.3 lcache.3 || die insinto /usr/share/doc/${P}/examples doins examples/{*.c,Makefile,README} || die insinto /usr/share/doc/${P}/examples/cache doins examples/cache/{*.c,Makefile,README} || die fi - - if use doc; then - insinto /usr/share/doc/${P} - doins paper/paper.ps || die - fi } pkg_postinst() {