commit: 53d77d95fd8d16be804883d15c1f031cbe118d5f Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> AuthorDate: Thu Oct 15 15:49:55 2015 +0000 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> CommitDate: Thu Oct 15 15:49:55 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d77d95
x11-wm/afterstep: dropped 2.2.11 due to missing slot deps Package-Manager: portage-2.2.20.1 x11-wm/afterstep/Manifest | 1 - x11-wm/afterstep/afterstep-2.2.11-r1.ebuild | 123 --------------------- .../files/afterstep-2.2.11-configure.patch | 13 --- .../files/afterstep-2.2.11-execinfo.patch | 84 -------------- 4 files changed, 221 deletions(-) diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest index f621ccf..7637ba0 100644 --- a/x11-wm/afterstep/Manifest +++ b/x11-wm/afterstep/Manifest @@ -1,3 +1,2 @@ -DIST AfterStep-2.2.11.tar.bz2 6126237 SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa SHA512 cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9 WHIRLPOOL 057d2420776be19db7ddf69ca7a7a2dae570dcca3b9fad4e56e8c9b4268d1f6c5dc6cbcc45b6caab41b3c06dcf7efe2b06289cf2684ac22a3dc2879282ff898f DIST AfterStep-2.2.12.tar.bz2 6132233 SHA256 ff15da51d4122b8e0286567052951e11a746e7d878dade9ce37f9217439ffbc8 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee WHIRLPOOL eca804facc37252ebd8e3b8d02f23b6fc66f8a8895337bcfd5cbd1f88f4e09868d0e2005a8be29be785b1259914bca132da7ac63f584964e535c3108a0182028 DIST AfterStep-2.2.9.tar.bz2 6094706 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5 WHIRLPOOL 49bae7a57f7f25703a8f3cbe4d8f18ba59131c9f1e5018de28f01eaee08e1f39b2f26e685d3d27f2d15ab7623fe88b61fa0997885a8a79b580a5225902bf6381 diff --git a/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild b/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild deleted file mode 100644 index d657927..0000000 --- a/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils flag-o-matic - -DESCRIPTION="A feature rich NeXTish window manager" -HOMEPAGE="http://www.afterstep.org/"; -SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2 - mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -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} - !!media-libs/libafterimage - x11-proto/xextproto - x11-proto/xproto - xinerama? ( x11-proto/xineramaproto )" - -S=${WORKDIR}/AfterStep-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.2.9-{alpha,ldflags,libpng15}.patch - epatch "${FILESDIR}"/${PN}-2.2.11-{execinfo,configure}.patch - - sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die - 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 - - pushd autoconf >/dev/null - eautoreconf - cp autoconf/config.h.in ./ || die - cp configure ../ || die - popd >/dev/null - - pushd libAfterBase >/dev/null - eautoreconf - popd >/dev/null -} - -src_configure() { - local myconf - - use debug && myconf="--enable-gdb --enable-warn --enable-gprof - --enable-audit --enable-trace --enable-trace-x" - - # 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 TODO "${D}"/usr/share/doc/${PF}/ - dodir /usr/share/doc/${PF}/html - cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html - rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in} - - insinto /usr/share/xsessions - newins AfterStep.desktop.final AfterStep.desktop - - # For desktop managers like GDM or KDE - exeinto /etc/X11/Sessions - doexe "${FILESDIR}"/${PN} -} diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch b/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch deleted file mode 100644 index 1ed6bd9..0000000 --- a/x11-wm/afterstep/files/afterstep-2.2.11-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/autoconf/configure.in b/autoconf/configure.in -index 4170f98..a16388e 100644 ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -105,7 +105,7 @@ AC_ARG_ENABLE(send-postcard-to-developer, [ --enable-send-postcard-to-developer - AC_ARG_ENABLE(data-reinstall, [ --enable-data-reinstall will prevent AfterStep from reinstalling image and font files.[[yes]] ],data_reinstall=$enableval,data_reinstall="yes") - - AC_ARG_ENABLE(script, [ --enable-script compile Script module [[yes]] ], enable_script=$enableval,enable_script="yes") --AC_ARG_ENABLE(reuse-font, [ --enable-reuse-font enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval == "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi]) -+AC_ARG_ENABLE(reuse-font, [ --enable-reuse-font enables reuse of loaded font resource by modules (don't use with TrueType fonts !)[[no]] ],[if test x$enableval = "xyes"; then AC_DEFINE(MODULE_REUSE_LOADED_FONT,1,Enables reuse of loaded font resource by modules) fi]) - - dnl# For FreeBSD, add -I/usr/local/include - diff --git a/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch b/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch deleted file mode 100644 index 61f4f08..0000000 --- a/x11-wm/afterstep/files/afterstep-2.2.11-execinfo.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/libAfterBase/configure.in b/libAfterBase/configure.in -index de055ea..eb5619e 100644 ---- a/libAfterBase/configure.in -+++ b/libAfterBase/configure.in -@@ -189,6 +189,8 @@ AC_CHECK_HEADERS(elf.h,[AC_CHECK_DECLS([ElfW],,,[#include <link.h>]) - AC_CHECK_MEMBERS([Elf32_Dyn.d_tag, Elf64_Dyn.d_tag],,,[#include <elf.h>]) - AC_CHECK_TYPES([Elf64_Addr, Elf32_Addr],,,[#include <elf.h>])]) - -+AC_CHECK_LIB([execinfo], [backtrace], [LIBS="$LIBS -lexecinfo"; lib_execinfo="-lexecinfo"]) -+ - dnl# this is needed for self diagnostic code : - AC_CHECK_FUNCS(backtrace_symbols_fd backtrace_symbols backtrace) - -@@ -257,6 +257,7 @@ AC_SUBST(lib_file_name) - AC_SUBST(with_locale) - AC_SUBST(user_ldflags) - AC_SUBST(x_libs) -+AC_SUBST(lib_execinfo) - AC_SUBST(X_CFLAGS) - AC_SUBST(LIBPROG) - AC_SUBST(LIBINSTALL) -diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in -index f04be29..c3bacbb 100644 ---- a/libAfterBase/Makefile.in -+++ b/libAfterBase/Makefile.in -@@ -80,6 +80,7 @@ INCLUDES = $(INCS_X) $(INCS_PRIVATE) - - USER_LD_FLAGS = @user_ldflags@ - LIBS_X = @x_libs@ -+LIB_EXECINFO = @lib_execinfo@ - - - LIBDIR = $(DESTDIR)@libdir@ -@@ -326,7 +327,7 @@ $(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHARED).$(LIBVER) - - $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) - $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \ -- $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS) -+ $(USER_LD_FLAGS) $(LIB_OBJS) $(LIBS_X) $(LIB_EXECINFO) - - install: install.lib - -diff --git a/autoconf/Makefile.defines.in b/autoconf/Makefile.defines.in -index e6c283f..f8cae5e 100644 ---- a/autoconf/Makefile.defines.in -+++ b/autoconf/Makefile.defines.in -@@ -40,6 +40,7 @@ LIBS_READLINE = @readline_libs@ - LIBS_X = @x_libs@ - LIBS_ALSA = @ALSA_LIBS@ - LIBS_XEXTS = -+LIB_EXECINFO = @lib_execinfo@ - LIB_AFTERBASE = @AFTERBASE_LIB@ - LIB_AFTERIMAGE = @AFTERIMAGE_LIB@ - LIB_AFTERSTEP = @AFTERSTEP_LIB@ -@@ -53,7 +54,7 @@ LIB_AFTERCONF_STATIC = @AFTERCONF_STATIC_LIB@ - LIB_ASGTK_STATIC = @ASGTK_STATIC_LIB@ - LIB_WIDGETS_STATIC = @WIDGETS_STATIC_LIB@ - LIBS_AFTERIMAGE = @AFTERIMAGE_LIBS@ --LIBRARIES = $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X) -+LIBRARIES = $(USER_LD_FLAGS) $(LIBS_PRIVATE) $(LIBS_XEXTS) $(LIBS_X) $(LIB_EXECINFO) - - LIBS_ALL = $(LIBRARIES) $(EXTRA_LIBRARIES) - -diff --git a/autoconf/configure.in b/autoconf/configure.in -index 45add70..4170f98 100644 ---- a/autoconf/configure.in -+++ b/autoconf/configure.in -@@ -651,6 +651,8 @@ if test "x$send_postcard_to_developer" = "xyes"; then - AC_DEFINE(DO_SEND_POSTCARD,1,E-mail installation notification to AfterStep developers) - fi - -+AC_CHECK_LIB([execinfo],[backtrace],[lib_execinfo="-lexecinfo"]) -+ - AC_CANONICAL_TARGET - AC_SUBST(build) - AC_SUBST(build_os) -@@ -718,6 +720,7 @@ AC_SUBST(with_desktops) - AC_SUBST(with_desktops_1) - AC_SUBST(with_deskgeometry) - AC_SUBST(no_data_reinstall) -+AC_SUBST(lib_execinfo) - dnl# old stuff : - AC_SUBST(enable_different_looknfeels) - AC_SUBST(enable_pagerbackground)
