From: Kacper Kowalik Date: Fri, 23 Sep 2011 17:35:12 +0000 (+0000) Subject: Version bump, EAPI4, fix install phase via patch instead of using helpers. Drop old X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c1779f628dc09d7d47eca40404d010ce72273bcb;p=gentoo.git Version bump, EAPI4, fix install phase via patch instead of using helpers. Drop old Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- diff --git a/sci-astronomy/cdsclient/ChangeLog b/sci-astronomy/cdsclient/ChangeLog index db6177f8ec0e..75135a85de7b 100644 --- a/sci-astronomy/cdsclient/ChangeLog +++ b/sci-astronomy/cdsclient/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-astronomy/cdsclient # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/ChangeLog,v 1.8 2011/08/04 18:29:29 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/ChangeLog,v 1.9 2011/09/23 17:35:12 xarthisius Exp $ + +*cdsclient-3.6b (23 Sep 2011) + + 23 Sep 2011; Kacper Kowalik -cdsclient-3.6.ebuild, + -cdsclient-3.6a.ebuild, +cdsclient-3.6b.ebuild, +files/cdsclient-gentoo.diff, + -files/cdsclient-makefile.in.patch: + Version bump, EAPI4, fix install phase via patch instead of using helpers. + Drop old 04 Aug 2011; Sébastien Fabbro metadata.xml: Switched herd to sci-astronomy diff --git a/sci-astronomy/cdsclient/Manifest b/sci-astronomy/cdsclient/Manifest index f1f22c37f851..ff46985f643c 100644 --- a/sci-astronomy/cdsclient/Manifest +++ b/sci-astronomy/cdsclient/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX cdsclient-makefile.in.patch 966 RMD160 4acedf9afe0c284ec4c8a92e8a0686975e8bba02 SHA1 9371b26a89e324696dea0c2ad1f11e3c68f112a1 SHA256 297e11de78370a880e399cdf376e341f546accc25f2c070a16ac7014b99e8f81 -DIST cdsclient-3.6.tar.gz 96451 RMD160 450a20017f65507bbb210d97e09de3e2903fa0ff SHA1 666ebc7d66ca61bfe82df062b3e5067ca6280f7d SHA256 f1e977d8eeccd6cb59d46e397469145198735808534f8d696ca42168a6b5d911 -DIST cdsclient-3.6a.tar.gz 96567 RMD160 da660e1a45ef89ddf4f94cd0ed80d7abc22c0f5d SHA1 3dc36966853ecdd6eeb2814136f96d05fad3d44b SHA256 c23c456cec6945f273ad5b7603e7de90cabae035a8748d62a628e35768daac13 -EBUILD cdsclient-3.6.ebuild 918 RMD160 4bbda8d99105e1fcbcf17e4fe468d71c3c5e31ce SHA1 4946153ea791556a5dc32111d5481f62e2fc2e70 SHA256 f10daebcce1722b55d7dada2191d43641e020243f8781052a8b925932bc7e3b0 -EBUILD cdsclient-3.6a.ebuild 944 RMD160 5904fa8ecc5dbfcc33caba97fd302580f81d45f5 SHA1 5691bdd5a8db120d1eda9910d0519a9c0f57752a SHA256 3b18be80c304b6317ccea82446b42252daa8475bd89ceac9c32a32882415c29d -MISC ChangeLog 1777 RMD160 c95965141d0fd6235136e45d6a55a0acdf2ebbda SHA1 39c98eb549a6d9aab610c6096476a32181a7c370 SHA256 1eef5d4e705b3e8474af8308b5fa5f0e6d8994d8e52b23a9b8fab13f9b5219d6 +AUX cdsclient-gentoo.diff 2647 RMD160 892a1e3b2b3f77e7ff790de34dd6307a149f7282 SHA1 b6a1bca2b27603eba4e46aad01155bbe35b30fa6 SHA256 5530b2b1ef56c77ee0bb5f7ec859e1cf855cdc2808203598f87971592f09c5d2 +DIST cdsclient-3.6b.tar.gz 96801 RMD160 945749ca3ef78d2255712a1a5f54690eacb64786 SHA1 5f7fa9ce2cbde8ac015be0543c2198dd1f9ea94c SHA256 c5265ce39ffc2ddaacad17b0de527da32909ffbb11af4472cd9af7284dcd4a39 +EBUILD cdsclient-3.6b.ebuild 750 RMD160 0556636427239c3322e63954e543afed3f2bf62b SHA1 2265aa9269f91027d5b45a095c5108905895027e SHA256 b092d6124f7384db3b9b7e14e1f199141ef99c73c10f0326b7b5c1e13add8691 +MISC ChangeLog 2094 RMD160 8c89e77044daafe98c3a69a742431da2f5d62def SHA1 84faa530680e02758ebacb0d11d4cee346e00438 SHA256 fe8cff9d10389b0e1aee81e6985a2c372f780420345e43134010b14fe3641716 MISC metadata.xml 430 RMD160 2e5fafb67352532fe1a91db04f201f33eb27d8ec SHA1 86ebd67b0110f54b22f3adf67cde869b512485a3 SHA256 145d15d3aada4d75908d17f9af08a5aac3442388cecb9d09dda02359aadf9a81 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk465REACgkQ1ycZbhPLE2DTMACgrO2pXmSPiPDUoiWotT6Ae3rW -bocAnAog1qJS0cdMfhyiTx3ijN6zxfCz -=OeDn +iJwEAQECAAYFAk58w1oACgkQIiMqcbOVdxRhowP8CfrqIkR0EQKGWYJ4v4m2WIf6 +MgoPYcIwFfV7kGaC1zZXS9OEHFoT77HEA0VYTPS26Zf5IYgQbcVfPbR+DDlih3vw +Dz3wEb2qLgyUOeu2ZGcNEGfZ3r5FWTOE4mN3S9Ao1eP/2gUcPEjA+hKdXpuUbsou +fR9mvChYZRx8qd7FA9M= +=Gh17 -----END PGP SIGNATURE----- diff --git a/sci-astronomy/cdsclient/cdsclient-3.6.ebuild b/sci-astronomy/cdsclient/cdsclient-3.6.ebuild deleted file mode 100644 index 597136c89866..000000000000 --- a/sci-astronomy/cdsclient/cdsclient-3.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/cdsclient-3.6.ebuild,v 1.1 2010/10/01 18:47:20 bicatali Exp $ - -EAPI=2 -inherit eutils - -DESCRIPTION="Collection of scripts to access the CDS databases" -HOMEPAGE="http://cdsweb.u-strasbg.fr/doc/cdsclient.html" -SRC_URI="ftp://cdsarc.u-strasbg.fr/pub/sw/${P}.tar.gz" -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="" -RDEPEND="app-shells/tcsh" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-makefile.in.patch - # remove non standard "mantex" page - sed -i \ - -e 's/aclient.tex//' \ - "${S}"/configure || die "sed failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man - dodir /usr/$(get_libdir) - emake \ - PREFIX="${D}"/usr \ - MANDIR="${D}"/usr/share/man \ - LIBDIR="${D}"/usr/$(get_libdir) \ - install || die "emake install failed" -} diff --git a/sci-astronomy/cdsclient/cdsclient-3.6a.ebuild b/sci-astronomy/cdsclient/cdsclient-3.6b.ebuild similarity index 56% rename from sci-astronomy/cdsclient/cdsclient-3.6a.ebuild rename to sci-astronomy/cdsclient/cdsclient-3.6b.ebuild index 00fc80ae836d..7803aa8f6aca 100644 --- a/sci-astronomy/cdsclient/cdsclient-3.6a.ebuild +++ b/sci-astronomy/cdsclient/cdsclient-3.6b.ebuild @@ -1,36 +1,29 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/cdsclient-3.6a.ebuild,v 1.1 2011/07/25 22:57:26 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/cdsclient-3.6b.ebuild,v 1.1 2011/09/23 17:35:12 xarthisius Exp $ -EAPI=2 -inherit eutils +EAPI=4 + +inherit eutils versionator DESCRIPTION="Collection of scripts to access the CDS databases" HOMEPAGE="http://cdsweb.u-strasbg.fr/doc/cdsclient.html" SRC_URI="ftp://cdsarc.u-strasbg.fr/pub/sw/${P}.tar.gz" + LICENSE="as-is" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" + DEPEND="" RDEPEND="app-shells/tcsh" -S="${WORKDIR}/${PN}-3.6" +S=${WORKDIR}/${PN}-$(get_version_component_range 1-2) + src_prepare() { - epatch "${FILESDIR}"/${PN}-makefile.in.patch + epatch "${FILESDIR}"/${PN}-gentoo.diff # remove non standard "mantex" page sed -i \ -e 's/aclient.tex//' \ - "${S}"/configure || die "sed failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man - dodir /usr/$(get_libdir) - emake \ - PREFIX="${D}"/usr \ - MANDIR="${D}"/usr/share/man \ - LIBDIR="${D}"/usr/$(get_libdir) \ - install || die "emake install failed" + "${S}"/configure || die } diff --git a/sci-astronomy/cdsclient/files/cdsclient-gentoo.diff b/sci-astronomy/cdsclient/files/cdsclient-gentoo.diff new file mode 100644 index 000000000000..c01253da9914 --- /dev/null +++ b/sci-astronomy/cdsclient/files/cdsclient-gentoo.diff @@ -0,0 +1,92 @@ +Respect LDFLAGS,CFLAGS, fix install + +--- a/Makefile.in ++++ b/Makefile.in +@@ -35,10 +35,10 @@ + ################################################################# + + INCDIR = $(PREFIX)/include +-LIBDIR = $(PREFIX)/lib ++LIBDIR = $(PREFIX)/@libdir@ + BINDIR = $(PREFIX)/bin + SHSDIR = $(PREFIX)/bin +-MANDIR = $(PREFIX)/man ++MANDIR = $(PREFIX)/share/man + ########### + # NOTE: The definition below is required only on SOLARIS + # Comment the following line if required +@@ -59,7 +59,6 @@ + DEBUG = + C_OPT = -O + SYS = +-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I. + + # FILES -------------------------------- + VERFILE = $(PREFIX)/versions +@@ -94,7 +93,7 @@ + # RULES -------------------------------- + .SUFFIXES: .o .c + .c.o: +- $(CC) $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) -I. -c $< + + # DEPENDENCIES -------------------------------- + +@@ -113,43 +112,41 @@ + # rm -f $$f; ln finducac2 $$f; done + + aclient: aclient.o $(OBJ) +- $(CC) $@.o $(OBJ) $(LIBSYS) -o $@ +- $(STRIP) $@ ++ $(CC) $(LDFLAGS) $@.o $(OBJ) $(LIBSYS) -o $@ + + wwwget: wwwget.c +- $(CC) wwwget.c $(LIBSYS) -o $@ +- $(STRIP) $@ ++ $(CC) $(LDFLAGS) wwwget.c $(LIBSYS) -o $@ + + doc: sk.tex man.tex aclient.tex + latex man.tex + +-install: $(EXPORT_INSTALL) install_shs install_info ++install: $(EXPORT_INSTALL) install_shs + rm -rf *.cache + + export_install: install_bin install_man + + install_man: $(MAN) +- if [ -d $(MANDIR) ]; then echo $(MANDIR) exists; \ +- else mkdir $(MANDIR); fi ++ if [ -d $(DESTDIR)$(MANDIR) ]; then echo $(DESTDIR)$(MANDIR) exists; \ ++ else mkdir -p $(DESTDIR)$(MANDIR); fi + for f in $(MAN); do \ + e=`echo $$f | cut -d. -f2`; \ +- if [ -d $(MANDIR)/man$$e ] ; then echo $(MANDIR)/man$$e exists ; \ +- else mkdir $(MANDIR)/man$$e ; fi ; \ +- $(COPY) $$f $(MANDIR)/man$$e ; \ ++ if [ -d $(DESTDIR)$(MANDIR)/man$$e ] ; then echo $(DESTDIR)$(MANDIR)/man$$e exists ; \ ++ else mkdir -p $(DESTDIR)$(MANDIR)/man$$e ; fi ; \ ++ $(COPY) $$f $(DESTDIR)$(MANDIR)/man$$e ; \ + done + + install_h: $(INC) +- test -d $(INCDIR) || mkdir $(INCDIR) +- $(COPY) $(INC) $(INCDIR) ++ test -d $(DESTDIR)$(INCDIR) || mkdir -p $(DESTDIR)$(INCDIR) ++ $(COPY) $(INC) $(DESTDIR)$(INCDIR) + + install_bin: $(BIN) +- test -d $(BINDIR) || mkdir $(BINDIR) +- $(COPY) $(BIN) $(BINDIR) ++ test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) ++ $(COPY) $(BIN) $(DESTDIR)$(BINDIR) + + install_shs: Makefile +- test -d $(SHSDIR) || mkdir $(SHSDIR) ++ test -d $(DESTDIR)$(SHSDIR) || mkdir -p $(DESTDIR)$(SHSDIR) + cdsutil="$(SHSatCDS)"; test -z "$(atCDS)" && cdsutil=""; \ +- cp -p $(SHS) $$cdsutil $(SHSDIR) ++ cp -p $(SHS) $$cdsutil $(DESTDIR)$(SHSDIR) + + install_info: + touch $(VERFILE) diff --git a/sci-astronomy/cdsclient/files/cdsclient-makefile.in.patch b/sci-astronomy/cdsclient/files/cdsclient-makefile.in.patch deleted file mode 100644 index c0dd3e06f166..000000000000 --- a/sci-astronomy/cdsclient/files/cdsclient-makefile.in.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.in.orig 2009-02-17 21:45:45.469037983 +0000 -+++ Makefile.in 2009-02-17 22:01:42.960921967 +0000 -@@ -59,7 +59,6 @@ - DEBUG = - C_OPT = -O - SYS = --CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I. - - # FILES -------------------------------- - VERFILE = $(PREFIX)/versions -@@ -91,7 +90,7 @@ - # RULES -------------------------------- - .SUFFIXES: .o .c - .c.o: -- $(CC) $(CFLAGS) -c $< -+ $(CC) $(CFLAGS) -I. -c $< - - # DEPENDENCIES -------------------------------- - -@@ -110,17 +109,15 @@ - rm -f $$f; ln finducac2 $$f; done - - aclient: aclient.o $(OBJ) -- $(CC) $@.o $(OBJ) $(LIBSYS) -o $@ -- $(STRIP) $@ -+ $(CC) $(LDFLAGS) $@.o $(OBJ) $(LIBSYS) -o $@ - - wwwget: wwwget.c -- $(CC) wwwget.c $(LIBSYS) -o $@ -- $(STRIP) $@ -+ $(CC) $(LDFLAGS) wwwget.c $(LIBSYS) -o $@ - - doc: sk.tex man.tex aclient.tex - latex man.tex - --install: $(EXPORT_INSTALL) install_shs install_info -+install: $(EXPORT_INSTALL) install_shs - rm -rf *.cache - - export_install: install_bin install_man