From 64a9424396cae6fcac8184e0d707c55da6362e96 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 10 Jan 2007 13:58:09 +0000 Subject: [PATCH] Cleanup build and add amd64 love. Package-Manager: portage-2.1.2_rc4-r7 --- dev-libs/shhopt/ChangeLog | 10 ++- dev-libs/shhopt/Manifest | 29 ++++++- dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 | 3 + .../shhopt/files/shhopt-1.1.7-build.patch | 83 +++++++++++++++++++ dev-libs/shhopt/shhopt-1.1.7-r2.ebuild | 32 +++++++ 5 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 create mode 100644 dev-libs/shhopt/files/shhopt-1.1.7-build.patch create mode 100644 dev-libs/shhopt/shhopt-1.1.7-r2.ebuild diff --git a/dev-libs/shhopt/ChangeLog b/dev-libs/shhopt/ChangeLog index 70e57f4de00c..3bca87ec24e2 100644 --- a/dev-libs/shhopt/ChangeLog +++ b/dev-libs/shhopt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/shhopt -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/shhopt/ChangeLog,v 1.4 2006/12/14 01:20:00 masterdriverz Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/shhopt/ChangeLog,v 1.5 2007/01/10 13:58:09 vapier Exp $ + +*shhopt-1.1.7-r2 (10 Jan 2007) + + 10 Jan 2007; Mike Frysinger + +files/shhopt-1.1.7-build.patch, +shhopt-1.1.7-r2.ebuild: + Cleanup build and add amd64 love. *shhopt-1.1.7-r1 (14 Dec 2006) diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest index 02e1b08c9a41..e034f3118a9c 100644 --- a/dev-libs/shhopt/Manifest +++ b/dev-libs/shhopt/Manifest @@ -1,16 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX shhopt-1.1.7-build.patch 1880 RMD160 89cd4aa599e35db489806cc37537678c186515cf SHA1 93d3e3c3ff3e557ae48efb2bd18312f798e81af3 SHA256 0d16fbb3816e422b576dd100eb40c4b5d8f8d4898f0e64939430ae2486aa98d8 +MD5 7209e1805730dc73d7db9ccf432b0c81 files/shhopt-1.1.7-build.patch 1880 +RMD160 89cd4aa599e35db489806cc37537678c186515cf files/shhopt-1.1.7-build.patch 1880 +SHA256 0d16fbb3816e422b576dd100eb40c4b5d8f8d4898f0e64939430ae2486aa98d8 files/shhopt-1.1.7-build.patch 1880 DIST shhopt-1.1.7.tar.gz 9923 RMD160 f987c4682d5119f73bf4c67693d9a83a85397408 SHA1 122103c9076e26087e0bd99e9745b2987700b268 SHA256 bae94335124efa6fcc2f0a55cabd68c9c90be935bcdb8054d7e5188e0d5da679 EBUILD shhopt-1.1.7-r1.ebuild 580 RMD160 0424803b516c90cd6bc974c722cd3b4ea39a045f SHA1 2b7ee40d0180d6f0ff1eafece78debd300d1a8e6 SHA256 8d7f4973867f690264f66a5e619fa4acf0fb2ed36bcc23c539ad9a01ce4887e6 MD5 ccdf5a914956c961b2a1f99c73a28142 shhopt-1.1.7-r1.ebuild 580 RMD160 0424803b516c90cd6bc974c722cd3b4ea39a045f shhopt-1.1.7-r1.ebuild 580 SHA256 8d7f4973867f690264f66a5e619fa4acf0fb2ed36bcc23c539ad9a01ce4887e6 shhopt-1.1.7-r1.ebuild 580 +EBUILD shhopt-1.1.7-r2.ebuild 804 RMD160 429b055eb037a2057d443cd8ba59dd9701260ffe SHA1 358c072a89db4a65e0254c1a6ac4b6795dcfd477 SHA256 607c07fbb2ca09e5c04081413f6f8d5e1d7edceb2ec53ba3a0d2e3245f88ca65 +MD5 43ebb2376a2609fef57c9a65a0dadebb shhopt-1.1.7-r2.ebuild 804 +RMD160 429b055eb037a2057d443cd8ba59dd9701260ffe shhopt-1.1.7-r2.ebuild 804 +SHA256 607c07fbb2ca09e5c04081413f6f8d5e1d7edceb2ec53ba3a0d2e3245f88ca65 shhopt-1.1.7-r2.ebuild 804 EBUILD shhopt-1.1.7.ebuild 563 RMD160 26e736c0ef73f1cf10d418d907714f2b6c0d48b5 SHA1 119b737b88c722a62407f0c5b8d2587b938bbce1 SHA256 718ba1c6b8b485ac2604c109d46d684631ba8e8cf302aafdf7e85106dc17f15f MD5 4b9922c3874d13ce6aa51818d754b8e6 shhopt-1.1.7.ebuild 563 RMD160 26e736c0ef73f1cf10d418d907714f2b6c0d48b5 shhopt-1.1.7.ebuild 563 SHA256 718ba1c6b8b485ac2604c109d46d684631ba8e8cf302aafdf7e85106dc17f15f shhopt-1.1.7.ebuild 563 -MISC ChangeLog 615 RMD160 f260ef734220654e01f27e67f37dcf002f366c88 SHA1 ec590baa6ba3c5cb335fa51eef147cd10c4227a8 SHA256 87d4ebd1dbd08b34c2c8f734d6efe5c0f824142e415a3d1e2e3d9c28634670a1 -MD5 d8a0a36abd07ac026246383321fa44ac ChangeLog 615 -RMD160 f260ef734220654e01f27e67f37dcf002f366c88 ChangeLog 615 -SHA256 87d4ebd1dbd08b34c2c8f734d6efe5c0f824142e415a3d1e2e3d9c28634670a1 ChangeLog 615 +MISC ChangeLog 787 RMD160 d3241308d8cd9544fa4405925fc0de7fb7b7fed7 SHA1 fb4398547100464c125f301f21029fff44469938 SHA256 8255bffe0d38d007b16f00d36321baeadd9afee172514722f32a29a7b22308ff +MD5 0e67d44472ac951dfdc1b16cc2002ee1 ChangeLog 787 +RMD160 d3241308d8cd9544fa4405925fc0de7fb7b7fed7 ChangeLog 787 +SHA256 8255bffe0d38d007b16f00d36321baeadd9afee172514722f32a29a7b22308ff ChangeLog 787 MISC metadata.xml 375 RMD160 f493682a73cac6e1c5c885fea19598b590c221dd SHA1 b0fb3ce53c996d92fb1482c0c6f5f5d3f912ca03 SHA256 c03c673560a2efba26ccad34f7884851a92c150e56386102d72717eabe17d6a4 MD5 558d571f347bb9f3f4a1c7c1fd711300 metadata.xml 375 RMD160 f493682a73cac6e1c5c885fea19598b590c221dd metadata.xml 375 @@ -21,3 +32,13 @@ SHA256 1f020b2cdaaffcf5cba66226c4c89ef1e2ac945ab88e6ffa9fcd0b8a6e80448d files/di MD5 200af14db6985e592e92de19ad008e99 files/digest-shhopt-1.1.7-r1 232 RMD160 bc47489ab3b420f3ecc5f7e17fbd187069352201 files/digest-shhopt-1.1.7-r1 232 SHA256 1f020b2cdaaffcf5cba66226c4c89ef1e2ac945ab88e6ffa9fcd0b8a6e80448d files/digest-shhopt-1.1.7-r1 232 +MD5 200af14db6985e592e92de19ad008e99 files/digest-shhopt-1.1.7-r2 232 +RMD160 bc47489ab3b420f3ecc5f7e17fbd187069352201 files/digest-shhopt-1.1.7-r2 232 +SHA256 1f020b2cdaaffcf5cba66226c4c89ef1e2ac945ab88e6ffa9fcd0b8a6e80448d files/digest-shhopt-1.1.7-r2 232 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFpPD78bi6rjpTunYRAtMwAJ9KHn0yNeznpjsRrrvRPLPtqDVD/QCcDvE1 +oU4sJZTE7j05ZdyqMT+bXSg= +=2OLR +-----END PGP SIGNATURE----- diff --git a/dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 b/dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 new file mode 100644 index 000000000000..4e14dfb2b384 --- /dev/null +++ b/dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 @@ -0,0 +1,3 @@ +MD5 caf24206354296e8a48771aea1f47fbd shhopt-1.1.7.tar.gz 9923 +RMD160 f987c4682d5119f73bf4c67693d9a83a85397408 shhopt-1.1.7.tar.gz 9923 +SHA256 bae94335124efa6fcc2f0a55cabd68c9c90be935bcdb8054d7e5188e0d5da679 shhopt-1.1.7.tar.gz 9923 diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch new file mode 100644 index 000000000000..d1d5606faab6 --- /dev/null +++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch @@ -0,0 +1,83 @@ +--- Makefile ++++ Makefile +@@ -5,20 +5,15 @@ + VERPAT = 7 + VERSION = $(VERMAJ).$(VERMIN).$(VERPAT) + +-# Define SHARED as 1 for Linux shared ELF library +-#SHARED = 1 +- +-ifeq ($(SHARED),1) + LIBTARGET = lib$(DIST).so.$(VERSION) + LIBTARGETSO = lib$(DIST).so + LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ) + CCSHRD = -fPIC +-else +-LIBTARGET = lib$(DIST).a +-endif ++ ++LIBTARGETA = lib$(DIST).a + + LIBHEAD = $(DIST).h +-TARGETS = $(LIBTARGET) ++TARGETS = $(LIBTARGET) $(LIBTARGETA) + + INSTBASEDIR = /usr/local + INSTLIBDIR = $(INSTBASEDIR)/lib +@@ -27,12 +22,12 @@ + INSTALLPROG = install -m 755 + MKDIRP = install -d -m 755 + +-CC = gcc +-OPTIM = -O2 +- +-INCDIR = -I. +- +-CCOPT = -s -Wall $(OPTIM) $(INCDIR) ++CC ?= gcc ++AR ?= ar ++ARFLAGS ?= rc ++RANLIB ?= ranlib ++CPPFLAGS += -I. ++CFLAGS += -Wall + + # Object files to store in the library + LIBOBJS = shhopt.o +@@ -43,21 +38,19 @@ + # don't worry if you get ranlib not found errors. This probably means + # that your ar does an implicit ranlib and you do not need to run ranlib + # separately. This error is harmless. +-$(LIBTARGET): $(LIBOBJS) +-ifeq ($(SHARED),1) +- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS) +-else +- ar rc $(LIBTARGET) $(LIBOBJS) +- ranlib $(LIBTARGET) || true +-endif ++$(LIBTARGET): $(LIBOBJS:.o=.lo) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $@ $^ ++$(LIBTARGETA): $(LIBOBJS) ++ $(AR) $(ARFLAGS) $@ $^ ++ $(RANLIB) $@ + + # Note that you may need GNU's -liberty if your libc lacks strtoul + example: $(LIBTARGET) example.o + $(CC) -o example example.c \ + -L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt + +-.c.o: +- $(CC) $(CCSHRD) -o $@ -c $(CCOPT) $< ++%.lo: %.c ++ $(COMPILE.c) $(CCSHRD) $^ -o $@ + + depend dep: + $(CC) $(INCDIR) -MM *.c >depend +@@ -73,7 +66,7 @@ + endif + + clean: +- rm -f *.o core *~ depend ++ rm -f *.o *.lo *.so* *.a core *~ depend + + chmod: + chmod a+r * diff --git a/dev-libs/shhopt/shhopt-1.1.7-r2.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r2.ebuild new file mode 100644 index 000000000000..28d80bd1597e --- /dev/null +++ b/dev-libs/shhopt/shhopt-1.1.7-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/shhopt/shhopt-1.1.7-r2.ebuild,v 1.1 2007/01/10 13:58:09 vapier Exp $ + +inherit eutils + +DESCRIPTION="library for parsing command line options" +HOMEPAGE="http://shh.thathost.com/pub-unix/" +SRC_URI="http://shh.thathost.com/pub-unix/files/${P}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-build.patch +} + +src_install() { + dolib.a libshhopt.a || die + ln -s libshhopt.so.${PV} libshhopt.so + ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} + dolib.so libshhopt.so* || die + insinto /usr/include + doins shhopt.h + dodoc ChangeLog CREDITS INSTALL README TODO +} -- 2.26.2