Rename crlf to wcscrlf and getdate to wcsgetdate to avoid colliding with other packages, closing bug #248235

(Portage version: 2.2_rc15/cvs/Linux 2.6.25-gentoo-r7 x86_64)

5 files changed, 27 insertions, 160 deletions

diff --git a/sci-astronomy/wcstools/ChangeLog b/sci-astronomy/wcstools/ChangeLog
index dae7d8080902..66ad82f01b2a 100644
--- a/sci-astronomy/wcstools/ChangeLog
+++ b/sci-astronomy/wcstools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-astronomy/wcstools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.10 2008/11/05 22:00:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/ChangeLog,v 1.11 2008/11/26 11:07:39 bicatali Exp $
+
+*wcstools-3.7.6-r1 (26 Nov 2008)
+
+  26 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/wcstools-3.7.1-autotools.patch,
+  files/wcstools-3.7.6-autotools.patch, -wcstools-3.7.4.ebuild,
+  -wcstools-3.7.6.ebuild, +wcstools-3.7.6-r1.ebuild:
+  Rename crlf to wcscrlf and getdate to wcsgetdate to avoid colliding with
+  other packages, closing bug #248235
 
 *wcstools-3.7.6 (05 Nov 2008)
 
diff --git a/sci-astronomy/wcstools/files/wcstools-3.7.1-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.7.1-autotools.patch
deleted file mode 100644
index a42dd1d484af..000000000000
--- a/sci-astronomy/wcstools/files/wcstools-3.7.1-autotools.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2007-10-18 12:55:35.947099866 +0100
-@@ -0,0 +1,11 @@
-+AC_PREREQ([2.59])
-+AC_INIT(wcstools, 3.7.1, [http://tdc-www.harvard.edu/wcstools/])
-+AM_INIT_AUTOMAKE([foreign])
-+AM_CONFIG_HEADER(config.h)
-+
-+AC_PROG_CC
-+AC_PROG_LIBTOOL
-+AC_C_CONST
-+AC_CHECK_LIB(m, sin)
-+AC_CONFIG_FILES([libwcs/Makefile libned/Makefile Makefile])
-+AC_OUTPUT
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2007-10-18 12:59:52.693731023 +0100
-@@ -0,0 +1,71 @@
-+SUBDIRS = libwcs libned
-+INCLUDES = -I$(top_srcdir)/libwcs
-+
-+bin_SCRIPTS = wcstools
-+
-+bin_PROGRAMS = \
-+	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
-+	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
-+	keyhead skycoor subpix xy2sky wcshead conpix gettab newfits getfits \
-+	imstack imextract sumpix remap getcol getdate imfill imsmooth imresize \
-+	fileroot filename filext char2sp sp2char crlf isnum isrange simpos bincat \
-+	nedname nedpos
-+
-+# these ones don't need libwcs
-+crlf_SOURCES = crlf.c
-+filename_SOURCES = filename.c
-+fileroot_SOURCES = fileroot.c
-+filext_SOURCES = filext.c
-+isrange_SOURCES = isrange.c
-+
-+LDADD = $(top_builddir)/libwcs/libwcs.la
-+
-+bincat_SOURCES = bincat.c
-+getcol_SOURCES = getcol.c
-+getdate_SOURCES = getdate.c
-+gethead_SOURCES = gethead.c
-+getfits_SOURCES = getfits.c
-+getpix_SOURCES = getpix.c
-+gettab_SOURCES = gettab.c
-+imcat_SOURCES = imcat.c
-+imsize_SOURCES = imsize.c
-+imstar_SOURCES = imstar.c
-+imwcs_SOURCES = imwcs.c
-+immatch_SOURCES = immatch.c
-+scat_SOURCES = scat.c
-+setpix_SOURCES = setpix.c
-+skycoor_SOURCES = skycoor.c
-+sumpix_SOURCES = sumpix.c
-+xy2sky_SOURCES = xy2sky.c
-+simpos_SOURCES = simpos.c
-+
-+addpix_SOURCES = addpix.c
-+char2sp_SOURCES = char2sp.c
-+conpix_SOURCES = conpix.c
-+cphead_SOURCES = cphead.c
-+delwcs_SOURCES = delwcs.c
-+delhead_SOURCES = delhead.c
-+edhead_SOURCES = edhead.c
-+fixpix_SOURCES = fixpix.c
-+i2f_SOURCES = i2f.c
-+imfill_SOURCES = imfill.c
-+imresize_SOURCES = imresize.c
-+imsmooth_SOURCES = imsmooth.c
-+imhead_SOURCES = imhead.c
-+imrot_SOURCES = imrot.c
-+imstack_SOURCES = imstack.c
-+imextract_SOURCES = imextract.c
-+isnum_SOURCES = isnum.c
-+keyhead_SOURCES = keyhead.c
-+newfits_SOURCES = newfits.c
-+remap_SOURCES = remap.c
-+sethead_SOURCES = sethead.c
-+sky2xy_SOURCES = sky2xy.c
-+sp2char_SOURCES = sp2char.c
-+subpix_SOURCES = subpix.c
-+wcshead_SOURCES = wcshead.c
-+
-+nedname_SOURCES = nedname.c
-+nedname_LDADD = $(top_builddir)/libned/libned.la $(top_builddir)/libwcs/libwcs.la
-+nedpos_SOURCES = nedpos.c
-+nedpos_LDADD = $(top_builddir)/libned/libned.la $(top_builddir)/libwcs/libwcs.la
---- libwcs/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ libwcs/Makefile.am	2007-10-18 12:20:44.266637126 +0100
-@@ -0,0 +1,17 @@
-+lib_LTLIBRARIES = libwcs.la
-+libwcs_la_SOURCES = \
-+	imsetwcs.c imgetwcs.c matchstar.c findstar.c daoread.c wcscon.c \
-+	fitswcs.c wcsinit.c wcs.c ty2read.c webread.c tmcread.c \
-+	gscread.c gsc2read.c ujcread.c uacread.c ubcread.c ucacread.c \
-+	sdssread.c tabread.c binread.c ctgread.c actread.c catutil.c \
-+	skybotread.c imrotate.c fitsfile.c imhfile.c \
-+	hget.c hput.c imio.c dateutil.c imutil.c \
-+	worldpos.c tnxpos.c dsspos.c platepos.c \
-+	sortstar.c platefit.c iget.c fileutil.c \
-+	wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c
-+
-+wcsdir = $(includedir)/wcs
-+wcs_HEADERS = \
-+	wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
-+
-+noinst_HEADERS = fitsfile1.h wcscat1.h
---- libned/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ libned/Makefile.am	2007-10-18 12:53:04.194451975 +0100
-@@ -0,0 +1,3 @@
-+lib_LTLIBRARIES = libned.la
-+libned_la_SOURCES = \
-+	ned_cli.c ned_cif.c ned_err.c ned_sk.c
diff --git a/sci-astronomy/wcstools/files/wcstools-3.7.6-autotools.patch b/sci-astronomy/wcstools/files/wcstools-3.7.6-autotools.patch
index 34bad3ba3c90..040e97dc8745 100644
--- a/sci-astronomy/wcstools/files/wcstools-3.7.6-autotools.patch
+++ b/sci-astronomy/wcstools/files/wcstools-3.7.6-autotools.patch
@@ -53,12 +53,12 @@
 +	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
 +	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
 +	keyhead skycoor subpix xy2sky wcshead conpix gettab newfits getfits \
-+	imstack imextract sumpix remap getcol getdate imfill imsmooth imresize \
-+	fileroot filename filext char2sp sp2char crlf isnum isrange isfits \
++	imstack imextract sumpix remap getcol wcsgetdate imfill imsmooth imresize \
++	fileroot filename filext char2sp sp2char wcscrlf isnum isrange isfits \
 +	simpos nedpos bincat nedname
 +
 +# these ones don't need libwcs
-+crlf_SOURCES = crlf.c
++wcscrlf_SOURCES = crlf.c
 +filename_SOURCES = filename.c
 +fileroot_SOURCES = fileroot.c
 +filext_SOURCES = filext.c
@@ -68,7 +68,7 @@
 +
 +bincat_SOURCES = bincat.c
 +getcol_SOURCES = getcol.c
-+getdate_SOURCES = getdate.c
++wcsgetdate_SOURCES = getdate.c
 +gethead_SOURCES = gethead.c
 +getfits_SOURCES = getfits.c
 +getpix_SOURCES = getpix.c
diff --git a/sci-astronomy/wcstools/wcstools-3.7.4.ebuild b/sci-astronomy/wcstools/wcstools-3.7.4.ebuild
deleted file mode 100644
index 6e442c4fdbd3..000000000000
--- a/sci-astronomy/wcstools/wcstools-3.7.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.7.4.ebuild,v 1.1 2008/06/26 12:19:21 bicatali Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="World Coordinate System library for astronomical FITS images"
-HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
-SRC_URI="http://tdc-www.harvard.edu/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.7.0-fix-leaks.patch
-	epatch "${FILESDIR}"/${PN}-3.7.1-autotools.patch
-	sed -i -e 's/3.7.x/${PV}/' configure.ac || die "sed failed"
-	eautoreconf
-}
-
-src_test() {
-	einfo "Testing various wcstools programs"
-	./newfits -a 10 -j 248 41 -p 0.15 test.fits || die "test newfits failed"
-	./sethead test.fits A=1 B=1 ||  die "test sethead failed"
-	[[ "$(./gethead test.fits RA)" == "16:32:00.000" ]] \
-		|| die "test gethead failed"
-	rm -f test.fits
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doman Man/man1/* || die "doman failed"
-	dodoc Readme Programs NEWS libned/NED_client || die "dodoc failed"
-	newdoc libwcs/Readme Readme.libwcs || die "newdoc failed"
-	newdoc libwcs/NEWS NEWS.libwcs || die "newdoc failed"
-}
diff --git a/sci-astronomy/wcstools/wcstools-3.7.6.ebuild b/sci-astronomy/wcstools/wcstools-3.7.6-r1.ebuild
index a0c668c5972d..7a2f9be68551 100644
--- a/sci-astronomy/wcstools/wcstools-3.7.6.ebuild
+++ b/sci-astronomy/wcstools/wcstools-3.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.7.6.ebuild,v 1.1 2008/11/05 22:00:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcstools/wcstools-3.7.6-r1.ebuild,v 1.1 2008/11/26 11:07:39 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -19,6 +19,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-autotools.patch
 	sed -i -e 's/3.7.x/${PV}/' "${S}"/configure.ac || die "sed failed"
 	eautoreconf
+	# avoid colliding with fixdos and getdate (also in autotools patch)
+	sed -i \
+		-e 's/getdate/wcsgetdate/' \
+		-e 's/crlf/wcscrlf/' \
+		wcstools || die
 }
 
 src_test() {
@@ -37,3 +42,10 @@ src_install() {
 	newdoc libwcs/Readme Readme.libwcs || die "newdoc failed"
 	newdoc libwcs/NEWS NEWS.libwcs || die "newdoc failed"
 }
+
+pkg_postinst() {
+	elog "The following execs have been renamed to avoid colliding"
+	elog "with other packages:"
+	elog " getdate -> wcsgetdate"
+	elog " crlf -> wcscrlf"
+}