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

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 33 insertions, 169 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/Manifest b/sci-astronomy/wcstools/Manifest
index a32227c98af3..8d2efc203004 100644
--- a/sci-astronomy/wcstools/Manifest
+++ b/sci-astronomy/wcstools/Manifest
@@ -2,18 +2,15 @@
 Hash: SHA1
 
 AUX wcstools-3.7.0-fix-leaks.patch 1354 RMD160 035017589cbf2fa6987b7f371b0528e2110c8572 SHA1 f02a6e3bc92770acedf94d7d9e572b8e9b30611c SHA256 4d670ef8a44f01ee887b0b73daf2a6ef007ddb9f2d80772a736bbb6719708ddc
-AUX wcstools-3.7.1-autotools.patch 3708 RMD160 42d112aa2d1b87a0947917145297ba9af71177b1 SHA1 d63e0c9e97f07a9ddbc8272977140fd4892ba7c9 SHA256 ac0488447885746c6d8f4c734c72aefe15342d01ff456f37c41051231b5762c9
-AUX wcstools-3.7.6-autotools.patch 4301 RMD160 0c0e48fa5b554feec594b5c587c2196a37bd3c0b SHA1 7ddd140c5bfcd74b3c9ce3bced7a74782cda46af SHA256 cf838abcc98a501a05560de558a4a930fba8e000f3221521b4978e22dfd85b6f
-DIST wcstools-3.7.4.tar.gz 871240 RMD160 6ca730b18f4b064ca0724b247cc1e83e34adf8bb SHA1 04c3a195a4b9c70b8bfeefbd8cc82e1cfaa80585 SHA256 4f48fac71634265453b80db0c27e7dd7324575b3cb96a9114f07f27ce09ed5e4
+AUX wcstools-3.7.6-autotools.patch 4313 RMD160 b6f9ca09fbd4dc0313d444d965fba7aa10dd5a11 SHA1 ff905728b5018406c1e55cadadf52ed14fb191fe SHA256 2c91da0763977b93d6847f0179ab5b38a0df6af5b1f43de3778d1b5d14c6ce2a
 DIST wcstools-3.7.6.tar.gz 1422216 RMD160 cb982c356dd1aa3fcffcec23ec0287539664a428 SHA1 101be78fb245dc7523cf05a699377324aa58dc56 SHA256 0b10313c9c1b15bc55a536ae41852366413df892514fe6652d0ad735911bbdfd
-EBUILD wcstools-3.7.4.ebuild 1326 RMD160 035e2193c25c64d2017c9deed04d48a3854812ad SHA1 f8c1cf4cd085a49d3e336b56d5ce96fc4a45864d SHA256 f60a9e837fe5bff79fc65104882be62c23464d65343a6c35511d8d3bbe0febce
-EBUILD wcstools-3.7.6.ebuild 1312 RMD160 be8defca8600e5bc74c10ec5e94d4cd0471c8cdf SHA1 5d5cedafec91402f27571e35e8dd93d73417a41a SHA256 50ba5b8ebb42969e79fe026eb58be03c9ab0d7a8c4cb73f7564f05c25469b877
-MISC ChangeLog 2945 RMD160 b7715070a55672a4decb847a18df9654532ff2de SHA1 2eafe03d5d47e3e734da5f543d1ff5ba32ae3164 SHA256 7e3c87f2189cc288a068b3b862e830ddd9f0769a03d96f35ba4c850a8c222ef8
+EBUILD wcstools-3.7.6-r1.ebuild 1638 RMD160 2a9241935fe01d9603f5cc3933770c03e3e0d6de SHA1 ed68ef9c69b9b1ca92c728e66eb891ba3aea7835 SHA256 1929e628ec620bfdf5606a7e02595f4c9402ed35317dbcc41fc3cebe1583f769
+MISC ChangeLog 3306 RMD160 031120ccd00adace89a8ee018ae3ee92dff4e853 SHA1 d3eec5430f8955103c6a4f033c02edb0bab2f488 SHA256 172aa96ccdb04da91c69bed492c32f9e81d5ff0d034cb682858b939d59620aa8
 MISC metadata.xml 834 RMD160 e926059e2d5bfdee9ed3007dccdeeb4e8ca33be9 SHA1 5c3dc78b145123adc79814ae6dcb1a9af47d7e24 SHA256 a09ecb01818fb06bcfebac7b81f11326b9ee9b0961d842a9ae64e53b2f1fa7cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkSF3kACgkQ1ycZbhPLE2B+qwCgjDjybdOUxHT082Jz1t8XHNaq
-/0EAniljKqjPNIvYSfppKWuS0t6wbK3Q
-=yYrs
+iEYEARECAAYFAkktLgUACgkQ1ycZbhPLE2ABQgCfQfrCbOT92HEa/jVScj/OyW14
+Z04AnAtqKDjaNT99+HtS8lpe6070Tv4x
+=sNfo
 -----END PGP SIGNATURE-----
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"
+}