From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AE8341381F1 for ; Fri, 13 May 2016 14:59:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34C16E0858; Fri, 13 May 2016 14:59:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0BA8E0858 for ; Fri, 13 May 2016 14:59:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBE39340B09 for ; Fri, 13 May 2016 14:59:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CBAFD6 for ; Fri, 13 May 2016 14:58:56 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1463151526.5b4ec9eb2107b8dad942f95ec32c255570e5e172.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/skychart/files/, sci-astronomy/skychart/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/skychart/Manifest sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch sci-astronomy/skychart/skychart-3.8.2450.ebuild X-VCS-Directories: sci-astronomy/skychart/ sci-astronomy/skychart/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 5b4ec9eb2107b8dad942f95ec32c255570e5e172 X-VCS-Branch: master Date: Fri, 13 May 2016 14:58:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d5e48d35-9c91-4b7e-addb-2fd2e254a224 X-Archives-Hash: 765f314b11a76c70a88818f675f1ba60 commit: 5b4ec9eb2107b8dad942f95ec32c255570e5e172 Author: Michael Palimaka gentoo org> AuthorDate: Fri May 13 14:56:36 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri May 13 14:58:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4ec9eb sci-astronomy/skychart: remove old Package-Manager: portage-2.2.28 sci-astronomy/skychart/Manifest | 1 - .../skychart/files/skychart-3.8.2450-QA.patch | 107 ------------------- sci-astronomy/skychart/skychart-3.8.2450.ebuild | 117 --------------------- 3 files changed, 225 deletions(-) diff --git a/sci-astronomy/skychart/Manifest b/sci-astronomy/skychart/Manifest index cd4889e..9907ec0 100644 --- a/sci-astronomy/skychart/Manifest +++ b/sci-astronomy/skychart/Manifest @@ -11,4 +11,3 @@ DIST catalog_wds.tgz 3659028 SHA256 b8d57f5ca4dd778c8396ea31919c2978f28aa3e42826 DIST data_jpleph.tgz 4576073 SHA256 cf375015f32cff79243699df023d9838e2599c59f477322dedf0c4da25831eb1 SHA512 06cd3c740c29cdb62b874de4afbbcb481ef757016dc828244f601382500400eac0af7b2f14086de327e12ec03b284b42c6bc5a2d98d8e678cd6b81f624bcb4bd WHIRLPOOL cb7d4363171d742812bc16ed3433d85bc3a235b78f00882a977882817089996255be2d8c69392c6cfa209eca96c3cef672b50ad576d1e05aa7450d8666db0aa2 DIST pictures_sac.tgz 38540724 SHA256 0257083278cad3e7fd28651f329af136149a65e3c655dcd0923ec691c470de44 SHA512 c477f8458505675be94a890caae0799223f667fb9cef9d27e7b03761659cb2951006c9514884e39d6af307886264c03fd0aac11951c38a72ef7dac2ed3388af6 WHIRLPOOL 707826c8c8ed8fef55441946b326543f1ff581b17bfaefce418a60fa4ad0a9ee5f3c600fccb1f1ca179c436d544821d156831baf5839173a9de3b4fe38c588df DIST skychart-3.10-2854-src.tar.xz 41878300 SHA256 0554e2b875531db6df96c3dc9c7d5dc9fa8b1937df002cd3e8a9bb20f795976b SHA512 898a32c86a6f8ebf8d28e9cd0eb68c9f7f32d717bc54a4e91e3e5468291544ee2c9b1355c19ec13d89e09a83543ebd159d4b5ec4db732c4105eab3bb1c218116 WHIRLPOOL b30efa210fd65290c30547cd0d7badcd45ef3b07fb2f1bacf570eaf01a910739b2bf32d033a1d6ceaad9593884e20bb7a7547eea7705f3b7975e869186c544f6 -DIST skychart-3.8-2450-src.tar.bz2 57002014 SHA256 61efa6f65cf81ea5ebdc35cb84e2be4b559202b0f3ff8b6a266eb0f2022527e5 SHA512 7d3275b8af6a3bcf4bec53dec5faa33fe4866eac8b55c63c68a8883764840ad373d23a2f86b68ec12d0c7e540d7e07dce0072fa713b6519b3fe3ed9dfb431461 WHIRLPOOL bdaa978e62781d3a4170559d07ff663c9f9c3f4eebe83d57bc5df98f3e554a0dd1b071f58ad21a3d64c188ea0808ac28b79a13f21a0bf27766fb3ac2c8467aa0 diff --git a/sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch b/sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch deleted file mode 100644 index 10d116a..0000000 --- a/sci-astronomy/skychart/files/skychart-3.8.2450-QA.patch +++ /dev/null @@ -1,107 +0,0 @@ -From: Julian Ospald -Date: Sun Apr 21 16:14:18 UTC 2013 -Subject: build system - -respect CFLAGS, LDFLAGS and don't do other silly stuff - ---- skychart-3.8-2450-src/skychart/library/getdss/Makefile -+++ skychart-3.8-2450-src/skychart/library/getdss/Makefile -@@ -1,21 +1,21 @@ - CPPFLAGS=-I. -DUNIX -D_CONSOLE -fPIC $(arch_flags) - #### For Suns and similar wrong-endian computers, add -DWRONG_WAY_BYTE_ORDER. --CC = gcc -+CC ?= gcc - OSTYPE = $(shell uname) - ifneq ($(findstring Darwin,$(OSTYPE)),) - SO_Name = libgetdss.dylib --LDFLAGS= -Wl,-single_module -dynamiclib -lc -lm -lstdc++ -+LDFLAGS += -Wl,-single_module -dynamiclib -lc -lm -lstdc++ - else - SO_Name = libgetdss.so --LDFLAGS= -shared -Wl,-soname,$(SO_Name) $(arch_flags) -+LDFLAGS += -shared -Wl,-soname,$(SO_Name) $(arch_flags) - endif - ifneq ($(findstring W32,$(OSTYPE)),) - SO_Name = libgetdss.dll --LDFLAGS= -shared -Wl,-soname,$(SO_Name) -+LDFLAGS += -shared -Wl,-soname,$(SO_Name) - endif - ifneq ($(findstring MINGW,$(OSTYPE)),) - SO_Name = libgetdss.dll --LDFLAGS= -shared -Wl,-soname,$(SO_Name) -+LDFLAGS += -shared -Wl,-soname,$(SO_Name) - endif - OBJS = getdss_lib.o dss.o extr_fit.o getpiece.o \ - hdcmprss.o bitinput.o decode.o dodecode.o hinv.o \ -@@ -25,7 +25,7 @@ - all: $(SO_Name) - - $(SO_Name): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) - - clean: - rm -f $(OBJS) $(SO_Name) ---- skychart-3.8-2450-src/skychart/library/plan404/Makefile -+++ skychart-3.8-2450-src/skychart/library/plan404/Makefile -@@ -1,7 +1,7 @@ - # Common flags --CC = gcc -+CC ?= gcc - #CFLAGS = -O3 -ffast-math (fast-math removed for better compatibility ) --CFLAGS = -O3 -fPIC $(arch_flags) -+CFLAGS += -fPIC $(arch_flags) - OSTYPE = $(shell uname) - ifneq ($(findstring Darwin,$(OSTYPE)),) - SO_Name = libplan404.dylib -@@ -35,7 +35,7 @@ - $(CC) $(CFLAGS) -c $< -o $@ - - $(SO_Name): $(OBJ) -- $(CC) $(CFLAGS) $(LIBFLAGS) -o $@ $(OBJ) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -o $@ $(OBJ) - - clean: - rm -f $(OBJ) $(SO_Name) ---- skychart-3.8-2450-src/skychart/library/wcs/Makefile -+++ skychart-3.8-2450-src/skychart/library/wcs/Makefile -@@ -1,5 +1,5 @@ --CFLAGS= -g -w -fPIC $(arch_flags) --CC= gcc -+CFLAGS += -w -fPIC $(arch_flags) -+CC ?= gcc - - OSTYPE = $(shell uname) - ifneq ($(findstring Darwin,$(OSTYPE)),) -@@ -29,7 +29,7 @@ - all: $(SO_Name) - - $(SO_Name): $(OBJS) -- $(CC) $(CFLAGS) $(LIBFLAGS) -o $@ $(OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -o $@ $(OBJS) - - cdcwcs.o: fitsfile.h wcs.h - actread.o: fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h ---- skychart-3.8-2450-src/skychart/library/Makefile.in -+++ skychart-3.8-2450-src/skychart/library/Makefile.in -@@ -23,14 +23,14 @@ - $(MAKE) -C wcs -f Makefile.win64 all - else - ifeq ($(CPU_TARGET),i386) -- $(MAKE) -C getdss all arch_flags=-m32 -- $(MAKE) -C plan404 all arch_flags=-m32 -- $(MAKE) -C wcs all arch_flags=-m32 -+ $(MAKE) -C getdss all -+ $(MAKE) -C plan404 all -+ $(MAKE) -C wcs all - else - ifeq ($(CPU_TARGET),x86_64) -- $(MAKE) -C getdss all arch_flags=-m64 -- $(MAKE) -C plan404 all arch_flags=-m64 -- $(MAKE) -C wcs all arch_flags=-m64 -+ $(MAKE) -C getdss all -+ $(MAKE) -C plan404 all -+ $(MAKE) -C wcs all - else - $(MAKE) -C getdss all - $(MAKE) -C plan404 all diff --git a/sci-astronomy/skychart/skychart-3.8.2450.ebuild b/sci-astronomy/skychart/skychart-3.8.2450.ebuild deleted file mode 100644 index 5414f8c..0000000 --- a/sci-astronomy/skychart/skychart-3.8.2450.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit toolchain-funcs gnome2-utils eutils - -DESCRIPTION="Planetarium for amauter astronomers" -HOMEPAGE="http://www.ap-i.net/skychart/" - -MY_PV=${PV:0:3}-${PV:4:4} -DATA_PKG="data_jpleph.tgz - catalog_gcvs.tgz - catalog_idx.tgz - catalog_tycho2.tgz - catalog_wds.tgz - catalog_gcm.tgz - catalog_gpn.tgz - catalog_lbn.tgz - catalog_ngc.tgz - catalog_ocl.tgz - catalog_pgc.tgz - pictures_sac.tgz" -SRC_URI="${DATA_SRC_URI} - mirror://sourceforge/skychart/1-%20cdc-skychart/version_${PV:0:3}/skychart-${MY_PV}-src.tar.bz2" -for i in ${DATA_PKG} ; do - SRC_URI="${SRC_URI} mirror://sourceforge/skychart/4-source_data/${i}" -done -unset i - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -# pascal -QA_FLAGS_IGNORED="usr/bin/cdcicon - usr/bin/skychart - usr/bin/varobs - usr/bin/varobs_lpv_bulletin" - -RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - >=dev-lang/lazarus-1.0.4 - >=dev-lang/fpc-2.6.0" - -S=${WORKDIR}/${PN}-${MY_PV}-src - -src_unpack() { - unpack skychart-${MY_PV}-src.tar.bz2 - - local i - for i in ${DATA_PKG} ; do - mkdir ${i} || die - cd ${i} || die - unpack ${i} - cd .. - done -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-QA.patch -} - -src_configure() { - tc-export CC CXX - - ./configure \ - fpcbin="/usr/bin" \ - fpc="/usr/lib/fpc/$(fpc -iV)/source" \ - lazarus="/usr/share/lazarus" \ - prefix="/usr" -} - -src_compile() { - # this is ugly, but the build system sux, so don't bother me - UNITDIR="/usr/share/lazarus/components/printers:/usr/share/lazarus/components/printers/unix" \ - INCDIR="/usr/share/lazarus/components/printers/unix:/usr/share/lazarus/components/printers" \ - emake -j1 -} - -src_install() { - # use build system install rules on version bump - # to check for new files - dobin varobs/{varobs,varobs_lpv_bulletin} - dobin skychart/cdcicon - newbin skychart/cdc skychart - - dolib.so skychart/library/plan404/libplan404.so - dolib.so skychart/library/getdss/libgetdss.so - dolib.so skychart/library/wcs/libcdcwcs.so - - insinto /usr/share - doins -r system_integration/Linux/share/{applications,icons,pixmaps} - - dodoc system_integration/Linux/share/doc/skychart/* - - insinto /usr/share/skychart - doins -r tools/{cat,data} - for i in ${DATA_PKG} ; do - cd "${WORKDIR}/${i}" || die - doins -r . - done -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -}