version bump

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

3 files changed, 226 insertions, 1 deletions

diff --git a/sci-astronomy/skychart/ChangeLog b/sci-astronomy/skychart/ChangeLog
index f660b73ba67a..e66d357ccf95 100644
--- a/sci-astronomy/skychart/ChangeLog
+++ b/sci-astronomy/skychart/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/skychart
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skychart/ChangeLog,v 1.3 2014/02/06 13:38:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skychart/ChangeLog,v 1.4 2014/04/03 12:29:38 hasufell Exp $
+
+*skychart-3.10.2854 (03 Apr 2014)
+
+  03 Apr 2014; Julian Ospald <hasufell@gentoo.org> +skychart-3.10.2854.ebuild,
+  +files/skychart-3.10.2854-QA.patch:
+  version bump
 
   06 Feb 2014; Julian Ospald <hasufell@gentoo.org> skychart-3.8.2450.ebuild:
   amd64 stable wrt #499842
diff --git a/sci-astronomy/skychart/files/skychart-3.10.2854-QA.patch b/sci-astronomy/skychart/files/skychart-3.10.2854-QA.patch
new file mode 100644
index 000000000000..085f04eaaa1c
--- /dev/null
+++ b/sci-astronomy/skychart/files/skychart-3.10.2854-QA.patch
@@ -0,0 +1,99 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Apr 21 16:14:18 UTC 2013
+Subject: 
+
+--- skychart-3.8-2450-src/skychart/library/getdss/Makefile
++++ skychart-3.8-2450-src/skychart/library/getdss/Makefile
+@@ -1,24 +1,24 @@
+ CPPFLAGS=-I. -O3 -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
+ 
+ OBJS = getdss_lib.o dss.o extr_fit.o getpiece.o \
+ 	hdcmprss.o bitinput.o decode.o dodecode.o hinv.o \
+ 	platelst.o qtreedec.o
+-LIBS = -lm -lstdc++
++LIBS += -lm -lstdc++
+ 
+ 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= -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
+@@ -24,14 +24,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.10.2854.ebuild b/sci-astronomy/skychart/skychart-3.10.2854.ebuild
new file mode 100644
index 000000000000..983ad694a20a
--- /dev/null
+++ b/sci-astronomy/skychart/skychart-3.10.2854.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/skychart/skychart-3.10.2854.ebuild,v 1.1 2014/04/03 12:29:38 hasufell Exp $
+
+EAPI=5
+
+inherit toolchain-funcs gnome2-utils eutils
+
+DESCRIPTION="Planetarium for amauter astronomers"
+HOMEPAGE="http://www.ap-i.net/skychart/"
+
+MY_PV=${PV:0:4}-${PV:5: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-software/version_${PV:0:4}/skychart-${MY_PV}-src.tar.xz"
+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"
+
+CDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11"
+RDEPEND="${CDEPEND}
+	x11-misc/xplanet"
+DEPEND="${CDEPEND}
+	>=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.xz
+
+	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,appdata,icons,pixmaps}
+
+	dodoc system_integration/Linux/share/doc/skychart/changelog
+
+	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
+}