diff options
author | Matt Turner <mattst88@gentoo.org> | 2012-08-07 15:49:44 +0000 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2012-08-07 15:49:44 +0000 |
commit | db4579b1e3626eecb7a2d67dfbb10662eb1ff059 (patch) | |
tree | 14ea6c368ff7980b811b7955b5759e319d5f5431 /x11-libs/libXaw3d | |
parent | version bump, by Jacques-Pascal Deplaix, bug #429546 (diff) | |
download | gentoo-2-db4579b1e3626eecb7a2d67dfbb10662eb1ff059.tar.gz gentoo-2-db4579b1e3626eecb7a2d67dfbb10662eb1ff059.tar.bz2 gentoo-2-db4579b1e3626eecb7a2d67dfbb10662eb1ff059.zip |
Drop old libXaw3d-1.5.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libXaw3d')
-rw-r--r-- | x11-libs/libXaw3d/ChangeLog | 6 | ||||
-rw-r--r-- | x11-libs/libXaw3d/files/Xaw3d-out-of-tree.diff | 11 | ||||
-rw-r--r-- | x11-libs/libXaw3d/files/Xaw3d-xfree86.diff | 21 | ||||
-rw-r--r-- | x11-libs/libXaw3d/libXaw3d-1.5-r1.ebuild | 75 |
4 files changed, 5 insertions, 108 deletions
diff --git a/x11-libs/libXaw3d/ChangeLog b/x11-libs/libXaw3d/ChangeLog index 90c251e8bde5..77af720657a2 100644 --- a/x11-libs/libXaw3d/ChangeLog +++ b/x11-libs/libXaw3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libXaw3d # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/ChangeLog,v 1.20 2012/07/27 23:16:01 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/ChangeLog,v 1.21 2012/08/07 15:49:44 mattst88 Exp $ + + 07 Aug 2012; Matt Turner <mattst88@gentoo.org> -files/Xaw3d-out-of-tree.diff, + -files/Xaw3d-xfree86.diff, -libXaw3d-1.5-r1.ebuild: + Drop old libXaw3d-1.5. 27 Jul 2012; Christoph Junghans <ottxor@gentoo.org> libXaw3d-1.6.2.ebuild: added prefix keywords from x11-libs/Xaw3d diff --git a/x11-libs/libXaw3d/files/Xaw3d-out-of-tree.diff b/x11-libs/libXaw3d/files/Xaw3d-out-of-tree.diff deleted file mode 100644 index 41af529025e2..000000000000 --- a/x11-libs/libXaw3d/files/Xaw3d-out-of-tree.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Imakefile.orig Thu Apr 30 19:50:26 1998 -+++ Imakefile Thu Apr 30 19:50:43 1998 -@@ -41,7 +41,7 @@ - - # EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY - --# EXTRA_INCLUDES = -I. -+EXTRA_INCLUDES = -I. - - HEADERS = \ - AllWidgets.h \ diff --git a/x11-libs/libXaw3d/files/Xaw3d-xfree86.diff b/x11-libs/libXaw3d/files/Xaw3d-xfree86.diff deleted file mode 100644 index a7665e36e7c2..000000000000 --- a/x11-libs/libXaw3d/files/Xaw3d-xfree86.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- XawI18n.h.orig Tue Aug 29 07:00:21 1995 -+++ XawI18n.h Tue Nov 19 02:22:09 1996 -@@ -27,12 +27,18 @@ - - ********************************************************/ - -+#if 0 - #ifdef HAS_WCTYPE_H - #include <wctype.h> -+#if !defined(__linux__) - #include <widec.h> -+#endif -+#endif - #define wcslen(c) wslen(c) - #define wcscpy(d,s) wscpy(d,s) - #define wcsncpy(d,s,l) wsncpy(d,s,l) -+#if 0 -+#endif - #endif - - #ifdef HAS_WCHAR_H diff --git a/x11-libs/libXaw3d/libXaw3d-1.5-r1.ebuild b/x11-libs/libXaw3d/libXaw3d-1.5-r1.ebuild deleted file mode 100644 index 06bd3117c597..000000000000 --- a/x11-libs/libXaw3d/libXaw3d-1.5-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/libXaw3d-1.5-r1.ebuild,v 1.1 2011/08/02 05:34:21 mattst88 Exp $ - -# Ok, hopefully this will resolv the problem with the version of libXaw3d that -# gets created. -# -# The problem its seems, is that when X gets compiled, it determines (with the -# help of some very dark magic) what version libXaw.so it it should build (6.1 or -# 7.0). Now, when compiling Xaw3d, it checks which version of Xaw was built, and -# then builds the same version of Xaw3d. -# -# Since this ebuild use the Makefile's "install" function, it "should" not be a -# problem anymore. -# -# Azarah. - -inherit eutils toolchain-funcs - -S=${WORKDIR}/xc/lib/Xaw3d -DESCRIPTION="drop-in 3D replacement of the Xaw widget set which comes with X" -HOMEPAGE="http://freshmeat.net/projects/xaw3d/" -# All full ftp.x.org mirrors can be added here. -SRC_URI="ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/${P/lib}.tar.gz - http://ibiblio.org/pub/X11/contrib/widgets/Xaw3d/R6.3/${P/lib}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="" - -# There _might_ be something else, but I doubt it. -RDEPEND="x11-libs/libXt - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXp" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - x11-misc/imake - x11-misc/gccmakedep - sys-devel/flex" - -src_unpack() { - unpack ${P/lib}.tar.gz - cd "${S}" - - # For some reason it isn't automatically patched. - # That's why I manually override the source_unpack function. - epatch "${FILESDIR}"/Xaw3d-xfree86.diff \ - "${FILESDIR}"/Xaw3d-out-of-tree.diff - - # This adds more familiar scroll-bar look and feel for Emacs and - # others <mkennedy@gentoo.org> - sed -i -e 's,#.*EXTRA_DEFINES,EXTRA_DEFINES,g' Imakefile || die -} - -src_compile() { - # convoluted process for out-of-tree building - mkdir ./X11 - cd ./X11 ; ln -sf ../../Xaw3d . ; cd .. - - xmkmf || die - make includes || die - make depend || die - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \ - SHLIBGLOBALSFLAGS="${LDFLAGS}" || die -} - -src_install() { - make DESTDIR="${D}" install || die - - dodoc README.XAW3D -} |