commit: 7886e1de9a3d2e3b8922c589f2bc4acfbcdf5cc5 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Jan 4 13:19:56 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Jan 4 13:23:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7886e1de
x11-wm/afterstep: Removed old. Package-Manager: Portage-2.3.19, Repoman-2.3.6 x11-wm/afterstep/Manifest | 1 - x11-wm/afterstep/afterstep-2.2.9.ebuild | 134 --------------------- x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch | 15 --- .../afterstep/files/afterstep-2.2.9-ldflags.patch | 37 ------ .../afterstep/files/afterstep-2.2.9-libpng15.patch | 31 ----- .../afterstep-2.2.9-make_session_data_file.patch | 14 --- x11-wm/afterstep/files/no-alternatives-2.2.9.patch | 29 ----- 7 files changed, 261 deletions(-) diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest index b801ed9aa4f..a47583fe984 100644 --- a/x11-wm/afterstep/Manifest +++ b/x11-wm/afterstep/Manifest @@ -1,2 +1 @@ DIST AfterStep-2.2.12.tar.bz2 6132233 BLAKE2B 44a597f55bd500f4bb34f499cc5f6f6a011b421d27fc118775fb9f3ff64d9553f5cb9e62aabcc8d0461ef53351e318ed0b6c0385654c40b2cc94d098e2040b05 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee -DIST AfterStep-2.2.9.tar.bz2 6094706 BLAKE2B 0241bd4b96114b80637acef87208983edd8edaecb0c127a06e105507ce8731354a5c420c3aeedad5750e8ee374dceb20933f6472ee2b3bd2cc18e720df6e4de2 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5 diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild deleted file mode 100644 index 4a450484b1f..00000000000 --- a/x11-wm/afterstep/afterstep-2.2.9.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools flag-o-matic eutils - -DESCRIPTION="A feature rich NeXTish window manager" -HOMEPAGE="http://www.afterstep.org/"; -SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"; - -# libAfterBase/libAfterImage are LGPL -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama" - -RDEPEND=" - media-libs/freetype - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - jpeg? ( virtual/jpeg ) - gif? ( >=media-libs/giflib-4.1.0 ) - gtk? ( x11-libs/gtk+:2 ) - png? ( media-libs/libpng:0 ) - svg? ( gnome-base/librsvg:2 ) - tiff? ( media-libs/tiff:0 ) - x11-libs/libICE - x11-libs/libXext - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama )" - -DEPEND="${RDEPEND} - x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto ) - !!media-libs/libafterimage" - -S=${WORKDIR}/AfterStep-${PV} - -src_prepare() { - epatch \ - "${FILESDIR}"/no-alternatives-${PV}.patch \ - "${FILESDIR}"/${P}-make_session_data_file.patch \ - "${FILESDIR}"/${P}-alpha.patch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-libpng15.patch - - sed -i \ - -e '/CFLAGS="-O3"/d' \ - libAfter{Base,Image}/configure || die - - sed -i \ - -e "/STRIP_BINARIES/s/-s//" \ - autoconf/configure.in || die #252119 - - sed -i \ - -e '/--with-builtin-gif/s/$with_gif/no/' \ - autoconf/configure.in || die #253259 - - cd "${S}"/autoconf || die - eautoreconf - cp "${S}"/autoconf/autoconf/config.h.in "${S}"/autoconf || die - cp "${S}"/autoconf/configure "${S}" || die -} - -src_configure() { - local myconf - - use debug && myconf="--enable-gdb --enable-warn --enable-gprof - --enable-audit --enable-trace --enable-trace-x" - - #implied intent of debug means you need the frame pointers. - use debug && filter-flags -fomit-frame-pointer - - # Explanation of configure options - # ================================ - # --with-helpcommand="xterm -e man" - Avoid installing xiterm - # --with-xpm - Contained in xfree - # --disable-availability - So we can use complete paths for menuitems - # --enable-ascp - The AfterStep ControlPanel is abandoned - # LDCONFIG - bug #265841 - - LDCONFIG=/bin/true econf \ - $(use_enable alsa) \ - $(use_enable cpu_flags_x86_mmx mmx-optimization) \ - $(use_enable nls i18n) \ - $(use_enable xinerama) \ - $(use_with dbus dbus1) \ - $(use_with gif) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) \ - $(use_with svg) \ - --with-helpcommand="xterm -e man" \ - --disable-availability \ - --disable-staticlibs \ - --enable-ascp=no \ - ${myconf} -} - -src_compile() { - # gcc: ../libAfterConf/libAfterConf.a: No such file or directory - # make[1]: *** [PrintDesktopEntries] Error 1 - emake -j1 -} - -src_install() { - emake DESTDIR="${D}" install - - # Create a symlink from MonitorWharf to Wharf - rm "${D}"/usr/bin/MonitorWharf - dosym /usr/bin/Wharf /usr/bin/MonitorWharf - - # Handle the documentation - dodoc ChangeLog INSTALL NEW* README* TEAM UPGRADE - cp -pPR "${S}"/TODO "${D}"/usr/share/doc/${PF}/ - dodir /usr/share/doc/${PF}/html - cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html - rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in} - - insinto /usr/share/xsessions - newins "${S}"/AfterStep.desktop.final AfterStep.desktop - - # For desktop managers like GDM or KDE - exeinto /etc/X11/Sessions - doexe "${FILESDIR}"/afterstep -} diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch deleted file mode 100644 index 307180b9bae..00000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch +++ /dev/null @@ -1,15 +0,0 @@ -libAfterStep/alpha_header.h:15: error: conflicting types for 'strlen' - ---- libAfterStep/asapp.h -+++ libAfterStep/asapp.h -@@ -15,10 +15,6 @@ - #include "sun_headers.h" - #endif - --#if defined(__alpha) --#include "alpha_header.h" --#endif /* NEEDS_ALPHA_HEADER */ -- - /* Some people say that AIX and AIXV3 need 3 preceding underscores, other say - * no. I'll do both */ - #if defined ___AIX || defined _AIX || defined __QNX__ || defined ___AIXV3 || defined AIXV3 || defined _SEQUENT_ \ No newline at end of file diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch b/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch deleted file mode 100644 index 5d27d7d8293..00000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-ldflags.patch +++ /dev/null @@ -1,37 +0,0 @@ -Respect LDFLAGS - -http://bugs.gentoo.org/show_bug.cgi?id=325309 - ---- autoconf/Makefile.common.lib.in -+++ autoconf/Makefile.common.lib.in -@@ -245,7 +245,7 @@ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) - - $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) -- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(LIB_OBJS) - - install: install.lib install.bin ---- libAfterImage/Makefile.in -+++ libAfterImage/Makefile.in -@@ -395,7 +395,7 @@ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) - - $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h -- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(LIB_OBJS) - - install.man: ---- libAfterBase/Makefile.in -+++ libAfterBase/Makefile.in -@@ -325,7 +325,7 @@ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR) - - $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) -- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ - $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS) - - install: install.lib diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch b/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch deleted file mode 100644 index b420489b326..00000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- libAfterImage/export.c -+++ libAfterImage/export.c -@@ -483,7 +483,7 @@ - png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); - if ( png_ptr != NULL ) - if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) -- if( setjmp(png_ptr->jmpbuf) ) -+ if( setjmp(png_jmpbuf(png_ptr)) ) - { - png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); - info_ptr = NULL ; ---- libAfterImage/import.c -+++ libAfterImage/import.c -@@ -1251,7 +1251,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ -- if ( !setjmp (png_ptr->jmpbuf)) -+ if ( !setjmp (png_jmpbuf(png_ptr))) - { - ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; - -@@ -1468,7 +1468,7 @@ - - static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) - { -- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr; -+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr); - memcpy(data, buf->buffer, length); - buf->buffer += length; - } diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch b/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch deleted file mode 100644 index 2c2f8bfeee3..00000000000 --- a/x11-wm/afterstep/files/afterstep-2.2.9-make_session_data_file.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/308649 - -asgtklookedit.c:658:3: warning: implicit declaration of function ‘make_session_data_file’ - ---- libASGTK/asgtklookedit.c -+++ libASGTK/asgtklookedit.c -@@ -28,6 +28,7 @@ - #include "../libAfterStep/parser.h" - #include "../libAfterStep/freestor.h" - #include "../libAfterStep/mystyle.h" -+#include "../libAfterStep/session.h" - #include "../libAfterConf/afterconf.h" - - #include <unistd.h> diff --git a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch deleted file mode 100644 index 4195413c5ee..00000000000 --- a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in.orig 2008-08-08 18:59:39.000000000 +0200 -+++ Makefile.in 2008-08-08 19:00:51.000000000 +0200 -@@ -71,7 +71,8 @@ - - module.clean: - --install: install.alternative install.desktop install.wmprops mkdir -+#install: install.alternative install.desktop install.wmprops mkdir -+install: install.desktop install.wmprops mkdir - @for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done - - install.bin: mkdir.bin -@@ -86,11 +87,11 @@ - install.script: mkdir.bin - @for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done - --install.alternative: -- @if update-alternatives --version > /dev/null 2>&1 ; then \ -- update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ -- echo "added AfterStep as an x-window-manager alternative"; \ -- fi -+#install.alternative: -+# @if update-alternatives --version > /dev/null 2>&1 ; then \ -+# update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \ -+# echo "added AfterStep as an x-window-manager alternative"; \ -+# fi - - - install.desktop: AfterStep.desktop.final mkdir.share
