[gentoo-commits] gentoo-x86 commit in x11-misc/xplanet: ChangeLog xplanet-1.3.0.ebuild xplanet-1.3.0-r1.ebuild

[Jeroen Roovers (jer)]

jer         14/01/24 19:48:27

  Modified:             ChangeLog xplanet-1.3.0.ebuild
  Added:                xplanet-1.3.0-r1.ebuild
  Log:
  Only apply giflib patch in unstable (bug #497188).
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.81                 x11-misc/xplanet/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/ChangeLog?r1=1.80&r2=1.81

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xplanet/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog	27 Dec 2013 22:55:08 -0000	1.80
+++ ChangeLog	24 Jan 2014 19:48:26 -0000	1.81
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xplanet
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/ChangeLog,v 1.80 2013/12/27 22:55:08 robbat2 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/ChangeLog,v 1.81 2014/01/24 19:48:26 jer Exp $
+
+*xplanet-1.3.0-r1 (24 Jan 2014)
+
+  24 Jan 2014; Jeroen Roovers <jer@g.o> xplanet-1.3.0.ebuild,
+  +xplanet-1.3.0-r1.ebuild:
+  Only apply giflib patch in unstable (bug #497188).
 
   27 Dec 2013; Robin H. Johnson <robbat2@g.o>
   +files/xplanet-1.3.0-giflib.patch, xplanet-1.3.0.ebuild:



1.7                  x11-misc/xplanet/xplanet-1.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild?r1=1.6&r2=1.7

Index: xplanet-1.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xplanet-1.3.0.ebuild	27 Dec 2013 22:55:08 -0000	1.6
+++ xplanet-1.3.0.ebuild	24 Jan 2014 19:48:27 -0000	1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild,v 1.6 2013/12/27 22:55:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0.ebuild,v 1.7 2014/01/24 19:48:27 jer Exp $
 
 EAPI=4
 inherit base flag-o-matic
@@ -14,7 +14,7 @@
 KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="gif jpeg png tiff truetype X"
 
-RDEPEND="gif? ( media-libs/giflib )
+RDEPEND="gif? ( <media-libs/giflib-4.2 )
 	jpeg? ( virtual/jpeg )
 	png? (
 		media-libs/libpng:0
@@ -40,8 +40,6 @@
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-PATCHES=( "${FILESDIR}"/xplanet-1.3.0-giflib.patch )
-
 src_configure() {
 	# econf says 'checking pnm.h presence... no'
 	use png && append-cppflags -I/usr/include/netpbm



1.1                  x11-misc/xplanet/xplanet-1.3.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: xplanet-1.3.0-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.3.0-r1.ebuild,v 1.1 2014/01/24 19:48:27 jer Exp $

EAPI=4
inherit base flag-o-matic

DESCRIPTION="Render images of the earth into the X root window"
HOMEPAGE="http://xplanet.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="gif jpeg png tiff truetype X"

RDEPEND="gif? ( >media-libs/giflib-4.2 )
	jpeg? ( virtual/jpeg )
	png? (
		media-libs/libpng:0
		media-libs/netpbm
		)
	tiff? ( media-libs/tiff:0 )
	truetype? (
		media-libs/freetype:2
		x11-libs/pango
		)
	X? (
		x11-libs/libX11
		x11-libs/libXext
		x11-libs/libXScrnSaver
		x11-libs/libXt
		)"
DEPEND="${RDEPEND}
	truetype? ( virtual/pkgconfig )
	X? (
		x11-proto/scrnsaverproto
		x11-proto/xproto
		)"

DOCS="AUTHORS ChangeLog NEWS README TODO"

PATCHES=( "${FILESDIR}"/xplanet-1.3.0-giflib.patch )

src_configure() {
	# econf says 'checking pnm.h presence... no'
	use png && append-cppflags -I/usr/include/netpbm

	local myconf

	use X \
		&& myconf+=" --with-x --with-xscreensaver" \
		|| myconf+=" --with-x=no --with-xscreensaver=no"

	use gif \
		&& myconf+=" --with-gif" \
		|| myconf+=" --with-gif=no"

	use jpeg \
		&& myconf+=" --with-jpeg" \
		|| myconf+=" --with-jpeg=no"

	use tiff \
		&& myconf+=" --with-tiff" \
		|| myconf+=" --with-tiff=no"

	use png \
		&& myconf+=" --with-png --with-pnm" \
		|| myconf+=" --with-png=no --with-pnm=no"

	use truetype \
		&& myconf+=" --with-freetype --with-pango" \
		|| myconf+=" --with-freetype=no --with-pango=no"

	econf \
		--with-cspice=no \
		${myconf}
}