Version bump and changed licensed to all-right-reserved (bug #470776)

(Portage version: 2.2.01.22097-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 55 insertions, 37 deletions

diff --git a/sci-astronomy/cdsclient/ChangeLog b/sci-astronomy/cdsclient/ChangeLog
index 0aa0ae8d10c7..bb58a7382cf6 100644
--- a/sci-astronomy/cdsclient/ChangeLog
+++ b/sci-astronomy/cdsclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-astronomy/cdsclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/ChangeLog,v 1.14 2013/03/04 21:06:55 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/ChangeLog,v 1.15 2013/07/08 17:22:15 bicatali Exp $
+
+*cdsclient-3.7.2 (08 Jul 2013)
+
+  08 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +cdsclient-3.7.2.ebuild,
+  +files/cdsclient-makefile.patch, -cdsclient-3.7.1.ebuild,
+  -files/cdsclient-gentoo.diff, metadata.xml:
+  Version bump and changed licensed to all-right-reserved (bug #470776)
 
   04 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org>
   files/cdsclient-gentoo.diff:
diff --git a/sci-astronomy/cdsclient/cdsclient-3.7.1.ebuild b/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild
index 2db14157804b..685a0de49aa1 100644
--- a/sci-astronomy/cdsclient/cdsclient-3.7.1.ebuild
+++ b/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/cdsclient-3.7.1.ebuild,v 1.2 2012/07/04 21:24:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/cdsclient/cdsclient-3.7.2.ebuild,v 1.1 2013/07/08 17:22:15 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils versionator
 
@@ -13,25 +13,26 @@ 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/${MYP}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
+RESTRICT="mirror bindist"
 DEPEND=""
 RDEPEND="app-shells/tcsh"
 
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-makefile.patch
 	# remove non standard "mantex" page
 	sed -i -e 's/aclient.tex//' configure || die
 }
 
 src_install() {
 	local bindir="${EPREFIX}/usr/bin/${PN}"
-	emake DESTDIR="${D}" SHSDIR="${bindir}" install
+	emake DESTDIR="${D}" SHSDIR="${D}${bindir}" install
 	cat <<-EOF > 99${PN}
 		PATH=${bindir}
 		ROOTPATH=${bindir}
diff --git a/sci-astronomy/cdsclient/files/cdsclient-gentoo.diff b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch
index b54b41e7849a..3f5e5fe58e9a 100644
--- a/sci-astronomy/cdsclient/files/cdsclient-gentoo.diff
+++ b/sci-astronomy/cdsclient/files/cdsclient-makefile.patch
@@ -1,13 +1,19 @@
-Respect LDFLAGS,CFLAGS, fix install
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -35,10 +35,10 @@
+--- Makefile.in.orig	2013-07-08 09:45:42.667070273 -0700
++++ Makefile.in	2013-07-08 09:46:43.928417641 -0700
+@@ -29,17 +29,17 @@
+ #################################################################
+ #PREFIX  = /usr/local
+ #PREFIX  = $(HOME)
+-PREFIX  = @prefix@
++PREFIX  = $(DESTDIR)@prefix@
+ PACKAGE = cdsclient
+ VERSION = @version@
+ DISTRIB = $(PACKAGE)-$(VERSION)
  #################################################################
  
  INCDIR  = $(PREFIX)/include
 -LIBDIR  = $(PREFIX)/lib
-+LIBDIR  = $(PREFIX)/@libdir@
++LIBDIR  = $(DESTDIR)/@libdir@
  BINDIR  = $(PREFIX)/bin
  SHSDIR  = $(PREFIX)/bin
 -MANDIR  = $(PREFIX)/man
@@ -15,15 +21,16 @@ Respect LDFLAGS,CFLAGS, fix install
  ###########
  # NOTE: The definition below is required only on SOLARIS
  #       Comment the following line if required
-@@ -59,7 +59,6 @@
+@@ -60,7 +60,7 @@
  DEBUG = 
  C_OPT = -O
  SYS = 
 -CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I.
++
  
  # FILES		--------------------------------
  VERFILE = $(PREFIX)/versions
-@@ -94,7 +93,7 @@
+@@ -98,7 +98,7 @@
  # RULES		--------------------------------
  .SUFFIXES: .o .c 
  .c.o:
@@ -32,18 +39,20 @@ Respect LDFLAGS,CFLAGS, fix install
  
  # DEPENDENCIES	--------------------------------
  
-@@ -113,43 +112,41 @@
+@@ -117,41 +117,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) $(CFLAGS) $(LDFLAGS) wwwget.c $(LIBSYS) -o $@
++
  
  doc: sk.tex man.tex aclient.tex
  	latex man.tex
@@ -55,38 +64,39 @@ Respect LDFLAGS,CFLAGS, fix install
  export_install: install_bin install_man 
  
  install_man: $(MAN)
--	if [ -d $(MANDIR) ]; then echo $(MANDIR) exists; \
+ 	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 
++	else mkdir -p $(MANDIR); fi 
  	for f in $(MAN); do \
  	    e=`echo $$f | cut -d. -f2`;  \
--	    if [ -d $(MANDIR)/man$$e ] ; then echo $(MANDIR)/man$$e exists ; \
+ 	    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 ;  \
++	    else mkdir -p $(MANDIR)/man$$e ; fi ; \
+ 	    $(COPY) $$f $(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)
++	test -d $(INCDIR) || mkdir -p $(INCDIR)
+ 	$(COPY) $(INC) $(INCDIR)
  
  install_bin: $(BIN)
 -	test -d $(BINDIR) || mkdir $(BINDIR)
--	$(COPY) $(BIN) $(BINDIR)
-+	test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
-+	$(COPY) $(BIN) $(DESTDIR)$(BINDIR)
++	test -d $(BINDIR) || mkdir -p $(BINDIR)
+ 	$(COPY) $(BIN) $(BINDIR)
  
  install_shs: Makefile
 -	test -d $(SHSDIR) || mkdir $(SHSDIR)
-+	test -d $(DESTDIR)$(SHSDIR) || mkdir -p $(DESTDIR)$(SHSDIR)
++	test -d $(SHSDIR) || mkdir -p $(SHSDIR)
+ 	ractools=""; test -r $(RACatCDS) && ractools=$(RACatCDS)/*; \
+         test -z "$$ractools" || ls -l $$ractools; \
  	cdsutil="$(SHSatCDS)"; test -z "$(atCDS)" && cdsutil=""; \
--	cp -p $(SHS) $$cdsutil $(SHSDIR)
-+	cp -p $(SHS) $$cdsutil $(DESTDIR)$(SHSDIR)
+@@ -189,7 +189,7 @@
+ 	$(MAKE) clean
+ 	-test -d /tmp/$(DISTRIB) && rm -rf /tmp/$(DISTRIB)
+ 	autoconf
+-	mkdir /tmp/$(DISTRIB)
++	mkdir -p /tmp/$(DISTRIB)
+ 	cp -p $(SHS) Makefile.in configure /tmp/$(DISTRIB)
+ 	test -z "$(atCDS)" || cp -p $(SHSatCDS) /tmp/$(DISTRIB)
  
- install_info:
- 	touch $(VERFILE)
diff --git a/sci-astronomy/cdsclient/metadata.xml b/sci-astronomy/cdsclient/metadata.xml
index 45e568d2443e..a084fd41b97b 100644
--- a/sci-astronomy/cdsclient/metadata.xml
+++ b/sci-astronomy/cdsclient/metadata.xml
@@ -5,7 +5,7 @@
 <longdescription lang="en">
   The cdsclient package is a set of C and csh routines which can be
   built on Unix stations or PCs running Linux, which once compiled allow
-  to query some databases located at CDS or on mirrors over the
-  network. 
+  to query some databases located at Centre de Donnees astronomiques
+  de Strasbourg (CDS) or on mirrors over the network.
 </longdescription>
 </pkgmetadata>