[This is a placeholder. Please ignore.]

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

6 files changed, 17 insertions, 215 deletions

diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog
index f7d2cd6060a0..6ec03a651d52 100644
--- a/x11-misc/xaos/ChangeLog
+++ b/x11-misc/xaos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xaos
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.39 2011/06/28 20:04:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.40 2011/09/17 11:04:26 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -xaos-3.2.ebuild,
+  -xaos-3.4-r1.ebuild, -files/xaos-3.4-makefile.patch,
+  -files/xaos-3.4-x11.patch:
+  [This is a placeholder. Please ignore.]
 
   28 Jun 2011; Brent Baude <ranger@gentoo.org> xaos-3.5-r1.ebuild:
   Marking xaos-3.5-r1 ppc for bug 342295
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index f3a902754f25..ce8528c49aa4 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -1,13 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xaos-3.4-include.patch 216 RMD160 9ee7b5e3222df188ec655d4e1a3e80af1a363e13 SHA1 281ca3e21fcf5d61404b9494be06c53b84f7c6d9 SHA256 5af6025bab16b6da5619d83aa7ef58688625bcb2ed5b1e1d22832c534675c078
-AUX xaos-3.4-makefile.patch 1091 RMD160 cc0bd0d86f095f2f51dc4bca97046f1e50657994 SHA1 b778ba1024aca3a0a66cee2f63e7eb735eff3d23 SHA256 f54d567c99cd0234304c0c42553b26bbafd092aeb907950e7dae4bc8cfe7a634
 AUX xaos-3.4-png.patch 328 RMD160 8f399021e90abaeb6b5f7f8f31790bc844c23abe SHA1 282b1e4814557bb667e905961eaf6d3789cbfa43 SHA256 4e20fe771648e8fdbfacc3525dfa3341f05b93deacea790c23bb27a7a8d4c3f2
-AUX xaos-3.4-x11.patch 351 RMD160 e121fc6c142f7794382d7734d74782830c253324 SHA1 a015477eea01bf399cc3b6d9a7a1f6dffebe6000 SHA256 b90882ed31053acc9800fd5ba70a8b983adf0219121538fa556e72edeffa89cd
-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
 DIST xaos.png.tar 10240 RMD160 383ffd2e0e4fcd39c8a2d090ab06173b91eae207 SHA1 791fd2a0a1d974d736b8a450f3d1a991ff46ec0c SHA256 23806369fa304bf58439f39d9c672fe7f2b4293b3b1bfcccffd0c7994faeaa6a
-EBUILD xaos-3.2.ebuild 1988 RMD160 44800d9e11c06853881701911054f1def3629679 SHA1 01b4f9cca9207ce57047a5da8e2250035eaa33b5 SHA256 5babdc8a39155628ba2fbadede0a0af79c4b91801a9999a05f5f803c9d342ecb
-EBUILD xaos-3.4-r1.ebuild 2302 RMD160 18f960ed7b35a5d6f5fdb30feff366575a07d63c SHA1 a86a2ff099dbc9bde10388e5f6e5831d97543f69 SHA256 9f3c81c961b5662ba4059f3e0032ca78dd84d0fbfeb40cb6f76b9f1e94fe60dc
 EBUILD xaos-3.5-r1.ebuild 1817 RMD160 1b6aee18a286325277a94ba3eb1465920285d14c SHA1 f0feda748e8b22d86098f1e53f06a3571c3d9bc4 SHA256 bc3d91a919ab49d9373b0328469f827d53683e7565c68744ebb0bceb4153f870
-MISC ChangeLog 5026 RMD160 c9c67aaa5efaac7bec1e45b11e8afdf7a3178941 SHA1 685de744c5e04cc2924b7e90f64e407d19a282ce SHA256 1b27c0a0f243071a66cc2263c8b4abbc02389cb97b14cdf4e0232faf05834a25
+MISC ChangeLog 5228 RMD160 e082f71cb3aa7417976bd0a02260770441b9c65a SHA1 da8d5bc3e9f5c8fa99d13909489eb06058894fa1 SHA256 c518a790dd3c9f4878fceb73fafa756ce26d0423802d35dc82e2bc822215dfca
 MISC metadata.xml 583 RMD160 5055148d95d127d29f4e963644eb666ac7e0c5eb SHA1 9f9eb601f2c7882611c1c0269b4e041c17335687 SHA256 2f0dd73d7c7fc6fd74d7a430ca50e03d390a200346bb9da765fefb8cb901bcf7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk50fvYACgkQXkR9YqOcLPFORgD/Q6F7E2QNZC2lHRYLGgbUIqIi
+mm0wUsCJ/9wFeeIwzYQA/15LbWd0G3Hyjs3obWtvgr4HtXOOomCyV9xtn9uG4CjE
+=9sWy
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xaos/files/xaos-3.4-makefile.patch b/x11-misc/xaos/files/xaos-3.4-makefile.patch
deleted file mode 100644
index db387b4ee1f8..000000000000
--- a/x11-misc/xaos/files/xaos-3.4-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.in.orig	2009-03-28 11:04:21.000000000 +0000
-+++ Makefile.in	2009-03-28 12:37:10.000000000 +0000
-@@ -32,11 +32,10 @@
- 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/tutorial
- 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/examples
- 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/catalogs
--	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc
- 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
- 	@INSTALL@ -d $(DESTDIR)$(bindir)
- 	@INSTALL@ -d $(DESTDIR)$(mandir)/man6
--	@INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
-+	@INSTALL@ bin/xaos $(DESTDIR)$(bindir)
- 	@INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
- 
- 	@INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples
-@@ -48,7 +47,6 @@
- 
- 	@INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs
- 	@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
--	@INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc
- 	@INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
- 	-@STICKY@
- 	test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
diff --git a/x11-misc/xaos/files/xaos-3.4-x11.patch b/x11-misc/xaos/files/xaos-3.4-x11.patch
deleted file mode 100644
index 46e8aae30980..000000000000
--- a/x11-misc/xaos/files/xaos-3.4-x11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ui/ui-drv/x11/ui_x11.c.orig
-+++ src/ui/ui-drv/x11/ui_x11.c
-@@ -430,6 +430,7 @@
-   replay = XCreateFontCursor (d->display, XC_dot);
-   if (d->truecolor || d->privatecolormap)
-     x11_driver.flags &= ~RANDOM_PALETTE_SIZE;
-+  xupdate_size (d); /* get real window size (#452284) --JEH */
-   if (!alloc_image (d))
-     {
-       xfree_display (d);
diff --git a/x11-misc/xaos/xaos-3.2.ebuild b/x11-misc/xaos/xaos-3.2.ebuild
deleted file mode 100644
index ef41d05a0662..000000000000
--- a/x11-misc/xaos/xaos-3.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.2.ebuild,v 1.8 2011/06/13 11:42:21 jlec Exp $
-
-inherit eutils
-
-MY_PN=XaoS
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A very fast real-time fractal zoomer"
-HOMEPAGE="http://sourceforge.net/projects/xaos/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
-	mirror://sourceforge/xaos/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="X svga aalib nls"
-
-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 )
-	sys-libs/zlib
-	media-libs/libpng"
-# 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
-				)
-			)"
-
-S="${WORKDIR}"/${MY_P}
-
-src_compile() {
-	local myconf
-	use X     || myconf="--with-x11-driver=no"
-#	use dga   || myconf="${myconf} --with-dga-driver=no"
-# ggi support removed due to upstream bug
-	#use ggi   ||
-	myconf="${myconf} --with-ggi-driver=no"
-	use svga  || myconf="${myconf} --with-svga-driver=no"
-#	use aalib || myconf="${myconf} --with-aa-driver=no"
-
-	#i18n support is quite broken in XaoS, it gets installed
-	#anyway, so we remove it later during install if not desired
-	use nls   || myconf="${myconf} --with-i18n=no"
-
-	./configure --prefix=/usr ${myconf} && make || die
-}
-
-src_install() {
-	# these get installed, assuming that the directories exist!
-	mkdir -p "${D}"/usr/share/locale/{hu,es,fr,cs,de}/LC_MESSAGES
-	mkdir -p "${D}"/usr/share/{man,info}
-	make \
-		prefix="${D}"/usr \
-		infodir="${D}"/usr/share/info \
-		mandir="${D}"/usr/share/man \
-		LOCALEDIR="${D}"/usr/share/locale \
-	install || die
-
-	use nls || rm -r "${D}"/usr/share/locale
-
-	dodoc ChangeLog* INSTALL* TODO*
-}
diff --git a/x11-misc/xaos/xaos-3.4-r1.ebuild b/x11-misc/xaos/xaos-3.4-r1.ebuild
deleted file mode 100644
index 7595dd584ae4..000000000000
--- a/x11-misc/xaos/xaos-3.4-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.4-r1.ebuild,v 1.3 2011/06/13 11:42:21 jlec Exp $
-
-EAPI=2
-inherit eutils autotools
-
-MY_PN=XaoS
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A very fast real-time fractal zoomer"
-HOMEPAGE="http://xaos.sf.net/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
-	mirror://sourceforge/xaos/${MY_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 )
-	svga? ( media-libs/svgalib )
-	X? ( x11-libs/libX11
-		 x11-libs/libXxf86dga
-		 x11-libs/libXext
-		 x11-libs/libXxf86vm )"
-# xaos has ggi support, but it doesn't build
-#	ggi?   ( media-libs/libggi )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( virtual/latex-base )
-	X? ( x11-proto/xf86vidmodeproto
-		 x11-proto/xextproto
-		 x11-proto/xf86dgaproto
-		 x11-proto/xproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-png.patch
-	epatch "${FILESDIR}"/${P}-include.patch
-	epatch "${FILESDIR}"/${P}-x11.patch
-	eautoreconf
-}
-
-src_configure() {
-	# use gsl and not nasm (see bug #233318)
-	econf \
-		--with-sffe=yes \
-		--with-ggi-driver=no \
-		--with-i386asm=no \
-		--with-gsl=yes \
-		$(use_enable nls) \
-		$(use_with png) \
-		$(use_with aalib aa-driver) \
-		$(use_with gtk gtk-driver) \
-		$(use_with svga svga-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* TODO RELEASE_NOTES \
-		doc/README{,.bugs} doc/{AUTHORS,PROBLEMS,SPONSORS}
-	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 "${WORKDIR}"/${PN}.png
-}