Version bump. Ebuild adpated to upstream file reorganisation

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 94 insertions, 74 deletions

diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog
index 338ef630b0de..e68064c2ae55 100644
--- a/x11-misc/xaos/ChangeLog
+++ b/x11-misc/xaos/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xaos
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.29 2009/03/28 12:55:30 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.30 2009/07/26 01:23:22 bicatali Exp $
+
+*xaos-3.5 (26 Jul 2009)
+
+  26 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> -xaos-3.4.ebuild,
+  +xaos-3.5.ebuild:
+  Version bump. Ebuild adpated to upstream file reorganisation
 
 *xaos-3.4-r1 (28 Mar 2009)
 
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index ae7f1cb72b01..0c7de989a997 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -8,15 +8,16 @@ AUX xaos-3.4-x11.patch 351 RMD160 e121fc6c142f7794382d7734d74782830c253324 SHA1
 AUX xaos.png 319 RMD160 0af927dfad2864509101cc93ca14c2442169451e SHA1 0e39df02d1b38c4d11fa671aac76f487ebd3af65 SHA256 5d7c854a3c6441b7040118ec7832aed45942f10d2d51a1fbd218b6e2a65a4994
 DIST XaoS-3.2.tar.gz 1227858 RMD160 b3cbc723bd94fa2c805531500c0d40c239b65382 SHA1 6083420d4d6061c2bc2a4f5e1dc1313e4d986fb3 SHA256 6fb464b9b4f05f1048346bba13c778bb592963d955d3a54ff6e3b72314730c12
 DIST XaoS-3.4.tar.gz 1977108 RMD160 37ce4728940e80c2876792650aa656236893d5f7 SHA1 4e419715ae0479fa3a20ed5f48ede7ad222f2d10 SHA256 2cdba9b356f725b278b20eaf925b54478ba24b722b1ddda3879a84ddc16a8c00
+DIST xaos-3.5.tar.gz 2930590 RMD160 193553818646fbf2d7c9f0c855ca3123446e16bc SHA1 6d16a58187fba7276e6bd0547cc2fd6bb073b801 SHA256 471fa752154a8e4c4687797fe1241df1b3f82400b2ef4e6a603969a27cd74842
 EBUILD xaos-3.2.ebuild 1935 RMD160 6046880b932581ddff7f9a54c1ea332a8c47bf60 SHA1 1b0560490af021d7edb56326d6de0c50164c4e9b SHA256 5db1faae97ea9f0b717b84a03a2c78611bba76b23d4206db68ed30f10fb0f05c
 EBUILD xaos-3.4-r1.ebuild 2254 RMD160 89d4b7fb131e9955e162519d242009a109c69d19 SHA1 b0cb803209c62e8c78734d3fafe043a376f4b968 SHA256 1601d6b061342156924ef9d107bb1c93048fc3331c121a50c58a7d21f88e98d8
-EBUILD xaos-3.4.ebuild 1517 RMD160 bdb18586af3a7ee0764918237380f05a761a074c SHA1 9a6336b39ee7e8c22d53ad171ff3ffe37cb5f7ee SHA256 9c4b3c1e775b48712a7074eb0ab1167350597519eacff95b7fa1ddb4317cb382
-MISC ChangeLog 3767 RMD160 b892f675b8e8dbf25f420993c1e160ae5f9f37cf SHA1 634234843e4f45461be14f1fa42e7bf977e475fa SHA256 08f69d32366a094533ef58c87b81f8ea4a0e634f72b858d1070ed9429a0db0c4
+EBUILD xaos-3.5.ebuild 1917 RMD160 efb3cf915c3678786a59145c839ec89541b08aff SHA1 10426f60c82ee1b552cd7c24d13956c30c82ad44 SHA256 98587a3fb95faed6e3d4301b36311f4291ac8a2dd16d423e0275edac8fc6a5d0
+MISC ChangeLog 3949 RMD160 512d8c52a19345bde943d1f5bd25d251372aa5fc SHA1 ef09df6c95c9e59ee87131a85b508f3bc6fe8f33 SHA256 7d7fa7834072cdd3b4fb8feb893eb4ab1a2ca39b00d91a1bc8c78da0977ea77f
 MISC metadata.xml 583 RMD160 5055148d95d127d29f4e963644eb666ac7e0c5eb SHA1 9f9eb601f2c7882611c1c0269b4e041c17335687 SHA256 2f0dd73d7c7fc6fd74d7a430ca50e03d390a200346bb9da765fefb8cb901bcf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknOHksACgkQ1ycZbhPLE2CZAQCdEyfMg2vUNKvoNLJJOUDTAFpj
-3AkAn27ss5zKC7isUORgU+qdH3AJUN7C
-=KdI3
+iEYEARECAAYFAkprsBMACgkQ1ycZbhPLE2CepgCgl7TMtpMcNzSlxZWYZGlL/VMZ
+nhQAnj84Hum/yhYG6o1KJirhpvsyC8cZ
+=hbbk
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xaos/xaos-3.4.ebuild b/x11-misc/xaos/xaos-3.4.ebuild
deleted file mode 100644
index 4f06dc885270..000000000000
--- a/x11-misc/xaos/xaos-3.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.4.ebuild,v 1.2 2008/07/31 22:36:54 markusle Exp $
-
-IUSE="aalib nls png svga threads X"
-
-MY_PN=XaoS
-MY_P=${MY_PN}-${PV}
-
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A very fast real-time fractal zoomer"
-HOMEPAGE="http://xaos.sf.net/"
-SRC_URI="mirror://sourceforge/xaos/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="X? (
-				(
-				x11-libs/libX11
-				x11-libs/libXxf86dga
-				x11-libs/libXext
-				x11-libs/libXxf86vm
-				)
-		   )
-	svga? ( >=media-libs/svgalib-1.4.3 )
-	aalib? ( media-libs/aalib )
-	png? ( media-libs/libpng )
-	sys-libs/zlib
-	sci-libs/gsl"
-# xaos has ggi support, but it doesn't build
-#	ggi?   ( media-libs/libggi )
-
-DEPEND="${RDEPEND}
-		X? (
-				(
-				x11-proto/xf86vidmodeproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xproto
-				)
-			)"
-
-src_compile() {
-	local myconf="--with-sffe=yes --with-ggi-driver=no"
-
-	# make sure we use gsl and not nasm (see bug #233318)
-	myconf="${myconf} --with-i386asm=no --with-gsl=yes"
-
-	econf \
-		$(use_with png) \
-		$(use_with aalib aa-driver) \
-		$(use_with svga svga-driver) \
-		$(use_with threads pthread) \
-		$(use_with X x11-driver) \
-		$(use_with X x) \
-		$(use_enable nls) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog* TODO RELEASE_NOTES README
-}
diff --git a/x11-misc/xaos/xaos-3.5.ebuild b/x11-misc/xaos/xaos-3.5.ebuild
new file mode 100644
index 000000000000..93652961e257
--- /dev/null
+++ b/x11-misc/xaos/xaos-3.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.5.ebuild,v 1.1 2009/07/26 01:23:22 bicatali Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="A very fast real-time fractal zoomer"
+HOMEPAGE="http://xaos.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="aalib doc -gtk nls png svga threads X"
+
+RDEPEND="sys-libs/zlib
+	sci-libs/gsl
+	aalib? ( media-libs/aalib )
+	gtk? ( >=x11-libs/gtk+-2 )
+	png? ( media-libs/libpng )
+	X? ( x11-libs/libX11
+		 x11-libs/libXxf86dga
+		 x11-libs/libXext
+		 x11-libs/libXxf86vm )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base )
+	X? ( x11-proto/xf86vidmodeproto
+		 x11-proto/xextproto
+		 x11-proto/xf86dgaproto
+		 x11-proto/xproto )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-png.patch
+	epatch "${FILESDIR}"/${PN}-3.4-include.patch
+	sed -i -e 's/-s//' Makefile.in
+	eautoreconf
+}
+
+src_configure() {
+	# use gsl and not nasm (see bug #233318)
+	econf \
+		--with-sffe=yes \
+		--with-gsl=yes \
+		$(use_enable nls) \
+		$(use_with png) \
+		$(use_with aalib aa-driver) \
+		$(use_with gtk gtk-driver) \
+		$(use_with threads pthread) \
+		$(use_with X x11-driver) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		cd "${S}"/doc
+		emake xaos.dvi || die
+		dvipdf xaos.dvi || die
+		cd "${S}"/help
+		emake html || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog* NEWS README AUTHORS
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/xaos.pdf || die
+		dohtml help/* || die
+	fi
+	local driver="x11"
+	use gtk && driver="\"GTK+ Driver\""
+	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
+		xaos "Application;Education;Math;Graphics;"
+	doicon "${FILESDIR}"/${PN}.png
+}