diff options
Diffstat (limited to 'x11-misc/xaos')
| -rw-r--r-- | x11-misc/xaos/Manifest | 8 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.4-include.patch | 4 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.4-png.patch | 11 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.6-buildsystem.patch | 86 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.6-locale-dir.patch | 11 | ||||
| -rw-r--r-- | x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch | 20 | ||||
| -rw-r--r-- | x11-misc/xaos/xaos-3.6.ebuild | 96 |
7 files changed, 137 insertions, 99 deletions
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest index 3c6f782d0083..9a900e34e282 100644 --- a/x11-misc/xaos/Manifest +++ b/x11-misc/xaos/Manifest @@ -1,9 +1,7 @@ -AUX xaos-3.4-include.patch 216 BLAKE2B c5ca3147c1ba7a6a45ee46673666d48aff359cd9a15f037534411c4420302d18dd037bae9c25927ac0f885148401a8afebecf465d706b3073d520946c18408f8 SHA512 d3ce4cc8a792ca22e63043d89a427cf46be2dd7e3427aefd364dacb7e721782ed8aefa7eee338fb658d5a2f13704eafbcd03e18ae589186d1c1718ff808337c3 -AUX xaos-3.4-png.patch 328 BLAKE2B 372470e5b7f7cc3bdf7975487088729476163b10e2dc9f57b78802bb4032affeab64c0634011067d8b1f3ded559ae68248c00a953f2d903365401181a546aeee SHA512 90ab707e2a6ad6fec1467afe7ed0f6cb44e5ac965eece94642966010b871fb7b7ef71745485869c7a94c4ddd73b176284a3b6a66866e9539f1dfe9b1934ef26b +AUX xaos-3.4-include.patch 143 BLAKE2B 8dcf1e4abb9b8acc2198a3ac6ff70a7900397c644c9712e4d1e5d5ab3bf9eafa6fa599b76e8a01c77495615c600b60068eb05de02da7dfd5409757086873fba1 SHA512 3d0caff1fef21b5b3c1184fcd926c4c410e226bc677a723585d9f3d56d5b5b7786104bd035790fc892c90243d531cfce243b7d7864556c0978f54fa31dd72c46 AUX xaos-3.5-build-fix-i686.patch 708 BLAKE2B 9c857438f7272a173b6047a3050e57311aa357fc59e280632d85ccfdf803ff3a232ab878fcef638506030077561406ed1d1152c8b960cd4528e1a5e1b098b39f SHA512 f1732cc5116f92893fc9e560e293e86df10901655dd12a2e6e81a90b13c216a613c5be60bce7adfc99ee21f5a6208c4f30a6730d1d5d3963e5efcba6d728c481 -AUX xaos-3.6-locale-dir.patch 346 BLAKE2B 9a025116efe60d643748e020bf0cc8801ccec96b46fb458b72fb1699cd37018f43645af311476c9dad5d91ff66acd8ca9df2407492436e814b7eb5708a3ba9af SHA512 c62b6c2b77bdb11bbd970f8f3d6ddc6844a86059918c7a54207a0e57bcd31e2f3feeb3c86f8ce58a3c9ee36939dbbe89ec5359d7fa0d5015dc6ad6cd8de24d6f -AUX xaos-3.6-no-auto-strip.patch 1025 BLAKE2B 87256eb029905c6c9aed7080452c15677e0b98535252b1a6ddf344b7866980c27039c721ab711f462383ed4ecd7d07e55e122b34728822c289958ff0e812a9eb SHA512 6a89bb992e2e503576f18a069c6f67b42a92a3f88b958f4b8b54d6ffc309ff30914cbf36b73400449306cd2ce1f646e9745820206c0be5ca39d26bbc4e469c8c +AUX xaos-3.6-buildsystem.patch 2460 BLAKE2B 7f8c5fe68e1f7f626236ffd687bb1e33ce1a064cf5555748fc7680b19b041db054a06616391a25e7fd9f37b0ae5a34bcb7773676d15d9222b4e416bc0fb704cf SHA512 79d1a738c709510dd36d4cbe17eb4376c212a81af2e08c45d292a182e9862f2f3e1f5075f488789f490d857f2b7eb76409d558caca93eb14914522f36f78d5cf DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262 -EBUILD xaos-3.6.ebuild 2161 BLAKE2B 7b8c33d496f869658a0c80c40dece6b1691e8aa363d281e9307593d1bdcf2f8bbca7ca15bb57aac791d0323f1dde9c37bee49aa82a1969a7781e3d6362b6b4a2 SHA512 68c1dc78483baafbffeec1cdf0268cc0b6bc0baf8e600b3efe1dafa49fd34c7caefef20922c9655b1c4595c96d36918b5555014c3c86c7e177cde90b2e8bcd98 +EBUILD xaos-3.6.ebuild 1875 BLAKE2B 0c2ab9399c4203dae8f744f117580b3fc81831fcccdf2c2e06c441c6572a99f59474f7e7001aaf6bb1006c0b208cda75c4692c745a3033d05ef91bbd09e915b4 SHA512 b013a5a86b3af90cb1065fa4dac2aaf8658d2a23098337d51b8bb04bb341253d00a01f8f0954b04966e533bb2cc1aa75b170a0516cddf5b01f6dec858a85ad8b MISC metadata.xml 766 BLAKE2B ca6be3fc4134359d4c6ea3eb8498b5235c87694bb76981747651c78b1fe00fa2d7d1c736910d3144101762fad9b26819df46af0270a4db5b0b39e623bef5eca5 SHA512 8e3ff6323fadbb15a6144c80bbbe33056072758dabb6e96e8b331f3327ea7e99b2a2c9b87b3532e70a1bd331b9d0e59be8b22c2fcad262eacf317c5b33647519 diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch index 65f7b8c5630c..3659ccc35a88 100644 --- a/x11-misc/xaos/files/xaos-3.4-include.patch +++ b/x11-misc/xaos/files/xaos-3.4-include.patch @@ -1,5 +1,5 @@ ---- src/util/thread.c.orig 2009-03-28 10:50:49.817619387 +0000 -+++ src/util/thread.c 2009-03-28 10:59:40.048185946 +0000 +--- a/src/util/thread.c ++++ b/src/util/thread.c @@ -1,3 +1,4 @@ +#include <stdlib.h> #ifndef _plan9_ diff --git a/x11-misc/xaos/files/xaos-3.4-png.patch b/x11-misc/xaos/files/xaos-3.4-png.patch deleted file mode 100644 index 454f8acaa994..000000000000 --- a/x11-misc/xaos/files/xaos-3.4-png.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2009-03-28 09:50:18.764999182 +0000 -+++ configure.in 2009-03-28 09:49:18.685947638 +0000 -@@ -98,7 +98,7 @@ - AC_ARG_WITH(png, - [ --with-png=yes/no enables/disables PNG saving support],[ - if test x$withval = xyes; then -- png=test -+ png=yes - fi - if test x$withval = xno; then - png=no diff --git a/x11-misc/xaos/files/xaos-3.6-buildsystem.patch b/x11-misc/xaos/files/xaos-3.6-buildsystem.patch new file mode 100644 index 000000000000..6cdb38ce6405 --- /dev/null +++ b/x11-misc/xaos/files/xaos-3.6-buildsystem.patch @@ -0,0 +1,86 @@ +--- a/configure.in ++++ b/configure.in +@@ -11,7 +11,6 @@ + + AC_PROG_CC + AX_COMPILER_VENDOR +-AX_CC_MAXOPT + + dnl + dnl GNU gettext related things +@@ -86,7 +85,7 @@ + AC_ARG_WITH(png, + [ --with-png=yes/no enables/disables PNG saving support],[ + if test x$withval = xyes; then +- png=test ++ png=yes + fi + if test x$withval = xno; then + png=no +@@ -141,7 +140,7 @@ + dnl Checks for programs. + + DRIVERDIRS="" +-LOCALEDIR="/usr/share/locale" ++LOCALEDIR="$prefix/share/locale" + DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a" + AC_PROG_INSTALL + +@@ -422,7 +421,7 @@ + AC_SUBST(REALTOPDIR) + BINPATH="$REALTOPDIR/bin" + AC_SUBST(BINPATH) +-AR="ar" ++AC_CHECK_TOOL([AR], [ar]) + AC_SUBST(AR) + SRCPATH="$REALTOPDIR/src" + AC_SUBST(SRCPATH) +@@ -450,7 +449,7 @@ + echo "using GSL for complex numbers" + GSL_LIBS=`$GSL_CONFIG --libs` + GSL_CFLAGS=`$GSL_CONFIG --cflags` +- CFLAGS="$CFLAGS $GSL_CFLAGS -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL" ++ CFLAGS="$CFLAGS $GSL_CFLAGS -DSFFE_USING -DSFFE_CMPLX_GSL" + DRIVERLIBS="$DRIVERLIBS lib/libsffe.a" + ASM_CMPLX_O="" + fi +@@ -473,8 +472,6 @@ + fi + fi + echo "------------------------------------------------------------" +-else +- CFLAGS="$CFLAGS -fomit-frame-pointer" + fi + + +--- a/Makefile.in ++++ b/Makefile.in +@@ -36,7 +36,7 @@ + @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 +@@ -49,7 +49,7 @@ + + @INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs + @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help +- @INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc ++ @INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc + @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 + test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)" + @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info +--- a/src/ui/ui-drv/gtk/Makefile.in ++++ b/src/ui/ui-drv/gtk/Makefile.in +@@ -2,7 +2,7 @@ + CFLAGS = @CFLAGS@ + LIBS = @LIBS@ -lm + LFLAGS = @LDFLAGS@ +-#AR = @AR@ ++AR = @AR@ + RANLIB = @RANLIB@ + + SRCS = ui_gtk.c diff --git a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch deleted file mode 100644 index 740f32d18985..000000000000 --- a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2014-06-09 10:54:18.459186718 -0700 -+++ configure.in 2014-06-09 10:56:47.472204763 -0700 -@@ -141,7 +141,7 @@ - dnl Checks for programs. - - DRIVERDIRS="" --LOCALEDIR="/usr/share/locale" -+LOCALEDIR="$prefix/share/locale" - DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a" - AC_PROG_INSTALL - diff --git a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch deleted file mode 100644 index ab6e6b56a9b8..000000000000 --- a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2014-06-09 10:42:00.574129368 -0700 -+++ Makefile.in 2014-06-09 10:43:04.035568767 -0700 -@@ -36,7 +36,7 @@ - @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 -@@ -49,7 +49,7 @@ - - @INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs - @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help -- @INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc -+ @INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc - @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 - test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)" - @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild index 8f8963c98d1b..b882b13e3fe1 100644 --- a/x11-misc/xaos/xaos-3.6.ebuild +++ b/x11-misc/xaos/xaos-3.6.ebuild @@ -1,51 +1,52 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils eutils +inherit autotools desktop DESCRIPTION="Very fast real-time fractal zoomer" HOMEPAGE="http://matek.hu/xaos/doku.php" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.gz https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux" IUSE="aalib doc -gtk nls png svga threads X" RDEPEND=" - sci-libs/gsl:0= - sys-libs/zlib:0= - aalib? ( media-libs/aalib:0= ) - gtk? ( x11-libs/gtk+:2= ) - nls? ( sys-devel/gettext ) + sci-libs/gsl:= + sys-libs/zlib + aalib? ( media-libs/aalib ) + gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) - X? ( x11-libs/libX11:0= - x11-libs/libXext:0= - x11-libs/libXxf86vm:0= )" - + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + )" DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +BDEPEND=" virtual/pkgconfig doc? ( virtual/texi2dvi ) - X? ( x11-base/xorg-proto )" + nls? ( sys-devel/gettext )" PATCHES=( - "${FILESDIR}"/${PN}-3.4-png.patch + "${FILESDIR}"/${PN}-3.6-buildsystem.patch "${FILESDIR}"/${PN}-3.4-include.patch "${FILESDIR}"/${PN}-3.5-build-fix-i686.patch - "${FILESDIR}"/${PN}-3.6-locale-dir.patch - "${FILESDIR}"/${PN}-3.6-no-auto-strip.patch ) src_prepare() { - autotools-utils_src_prepare + default + mv configure.{in,ac} || die + eautoreconf + if use nls; then - if [[ "${LINGUAS+set}" == "set" ]]; then + if [[ ${LINGUAS+set} == set ]]; then strip-linguas -i src/i18n sed -i -e '/^ALL_LINGUAS=/d' configure || die export ALL_LINGUAS="${LINGUAS}" @@ -56,41 +57,36 @@ src_prepare() { } src_configure() { - local myeconfargs=( - --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) + 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) - ) - autotools-utils_src_configure } src_compile() { - autotools-utils_src_compile + default + if use doc; then - cd "${BUILD_DIR}"/doc - emake xaos.dvi - dvipdf xaos.dvi || die - cd "${BUILD_DIR}"/help - emake html + emake -C doc xaos.dvi + dvipdf doc/xaos.dvi || die + + emake -C help html + rm -r help/rest || die + HTML_DOCS=( help/. ) fi } src_install() { - autotools-utils_src_install - if use doc; then - insinto /usr/share/doc/${PF} - doins doc/xaos.pdf - dohtml -r help/* - fi - local driver="x11" - use gtk && driver="\"GTK+ Driver\"" - make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \ - xaos "Application;Education;Math;Graphics;" + default + use doc && dodoc xaos.pdf + + make_desktop_entry "xaos -driver $(usex gtk '"GTK+ Driver"' x11)" "XaoS Fractal Zoomer" \ + xaos "Education;Math;Graphics;" doicon "${WORKDIR}"/${PN}.png } |