From ea10da957869ac9c73033a6a4b51538d27fddc0a Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 2 Aug 2011 05:38:35 +0000 Subject: [PATCH] Rename Xaw3d to libXaw3d. --- x11-libs/Xaw3d/ChangeLog | 94 --------------------- x11-libs/Xaw3d/Manifest | 6 -- x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild | 75 ---------------- x11-libs/Xaw3d/files/Xaw3d-out-of-tree.diff | 11 --- x11-libs/Xaw3d/files/Xaw3d-xfree86.diff | 21 ----- x11-libs/Xaw3d/metadata.xml | 5 -- x11-libs/vte/ChangeLog | 6 +- x11-libs/vte/Manifest | 16 +--- x11-libs/vte/vte-0.28.1-r200.ebuild | 4 +- x11-libs/vte/vte-0.28.1-r300.ebuild | 4 +- 10 files changed, 12 insertions(+), 230 deletions(-) delete mode 100644 x11-libs/Xaw3d/ChangeLog delete mode 100644 x11-libs/Xaw3d/Manifest delete mode 100644 x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild delete mode 100644 x11-libs/Xaw3d/files/Xaw3d-out-of-tree.diff delete mode 100644 x11-libs/Xaw3d/files/Xaw3d-xfree86.diff delete mode 100644 x11-libs/Xaw3d/metadata.xml diff --git a/x11-libs/Xaw3d/ChangeLog b/x11-libs/Xaw3d/ChangeLog deleted file mode 100644 index 4f43f107b3f2..000000000000 --- a/x11-libs/Xaw3d/ChangeLog +++ /dev/null @@ -1,94 +0,0 @@ -# ChangeLog for x11-libs/Xaw3d -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/Xaw3d/ChangeLog,v 1.30 2011/07/12 18:02:12 mattst88 Exp $ - - 12 Jul 2011; Matt Turner Xaw3d-1.5-r1.ebuild: - Added sys-devel/flex to DEPEND, bug 221417 - - 06 Feb 2011; Mart Raudsepp Xaw3d-1.5-r1.ebuild: - Drop to ~mips - - 14 Dec 2009; Rémi Cardona Xaw3d-1.5-r1.ebuild: - change LICENSE to MIT - - 26 Sep 2009; Víctor Ostorga Xaw3d-1.5-r1.ebuild: - Respecting LDFLAGS , bug 209744 - - 10 Feb 2007; Fabian Groffen Xaw3d-1.5-r1.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 01 Oct 2006; Donnie Berkholz ; Xaw3d-1.5-r1.ebuild: - libXext has a runtime dep on xextproto now, so we don't need to depend on it - here. - - 24 Sep 2006; Donnie Berkholz ; Xaw3d-1.5-r1.ebuild: - Remove virtual/x11 option from modular X deps. - - 03 May 2006; Diego Pettenò Xaw3d-1.5-r1.ebuild: - Add ~x86-fbsd keyword. - - 30 Dec 2005; Doug Goldstein Xaw3d-1.5-r1.ebuild: - Fixing modular X depends as per requested. Bug #117166 - - 18 Dec 2005; Donnie Berkholz ; Xaw3d-1.5-r1.ebuild: - (#115920) Add gccmakedep to DEPEND. - - 11 Dec 2005; Donnie Berkholz ; Xaw3d-1.5-r1.ebuild: - Add modular X dependencies. - - 24 Oct 2004; Mamoru KOMACHI Xaw3d-1.5-r1.ebuild: - Stable on ppc-macos. - - 22 Sep 2004; Mamoru KOMACHI Xaw3d-1.5-r1.ebuild: - Added to ~ppc-macos. - - 24 Jul 2004; Stephen P. Becker Xaw3d-1.5-r1.ebuild: - Stable on mips. - - 16 Jul 2004; Tom Gall Xaw3d-1.5-r1.ebuild: - stable on ppc64 - - 28 Jun 2004; Aron Griffis Xaw3d-1.5-r1.ebuild: - add sed-4 dep - - 14 Jun 2004; Tom Gall Xaw3d-1.5-r1.ebuild: - ~ppc64 initial x support, bug #53763 - - 17 Apr 2004; Daniel Ahlberg Xaw3d-1.5-r1.ebuild: - Added IUSE= - - 14 Apr 2004; Stephen P. Becker Xaw3d-1.5-r1.ebuild: - Added ~mips keyword. - - 18 Feb 2004; Aron Griffis Xaw3d-1.5-r1.ebuild: - stable on ia64 - - 20 Dec 2003; Guy Martin Xaw3d-1.5-r1.ebuild: - Marked stable on hppa. - - 13 Dec 2003; Brad House Xaw3d-1.5-r1.ebuild: - mark stable on amd64 - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*Xaw3d-1.5-r1 (1 Feb 2002) - - 10 Mar 2003; Aron Griffis Xaw3d-1.5-r1.ebuild: - Mark stable on alpha - - 01 Dec 2002; Matthew Kennedy ChangeLog, - Xaw3d-1.5-r1.ebuild : - - Tweak for more familiar scroll-bar support. Added more happiness for - lintool. - - 15 Jul 2002; Mark Guertin - Added ppc to keywords - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/x11-libs/Xaw3d/Manifest b/x11-libs/Xaw3d/Manifest deleted file mode 100644 index aaa5bc2790b6..000000000000 --- a/x11-libs/Xaw3d/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX Xaw3d-out-of-tree.diff 232 RMD160 eb692178879bea30915f835aa95e39aac1946d77 SHA1 9b1f1cc5b7413f45e0dd2c65e7e2972566e55ede SHA256 0b4c2c01aad13f404f0ae106ea5420f534efdb3252ae4d689419171aad1651d7 -AUX Xaw3d-xfree86.diff 420 RMD160 e81d2490cbf5a51c12f31a967f9ac63219cb05db SHA1 f61648d67769bbfa88fa81bfb10dacee554f40cf SHA256 a36da9169200e316c6ae83647c19e404b92f59eed596b6bc1561c9dba3054d3b -DIST Xaw3d-1.5.tar.gz 284420 RMD160 b2e03f0684aa71f8acc8cc35d3bb0edacbb86a1e SHA1 ba10e9f9a376932eed9696006e34d4618a6f588d SHA256 41866c4926f6d77c7ed5f8776c1c02cd060d593830112b28ad4e5d43c143df08 -EBUILD Xaw3d-1.5-r1.ebuild 2179 RMD160 7e696463ebce89df6d58ff1aa17cf7e3aac9f7d3 SHA1 c64839af23ab25615ce7ff7156c052a6ee31ddd3 SHA256 901699a20b02be78954d3b4162a544e663ad6901bfa083f81cb21f4ca5ed1156 -MISC ChangeLog 3363 RMD160 cdb069f9de694ee1feef24b3c4da1c6040176ded SHA1 f3b31637d0c5355cc7942b4557d7042a5cbbd9ca SHA256 9909c44f639947e59c4bd8eecd2510d4f6ee7eec1b22283c75ab31c23c89fd20 -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild b/x11-libs/Xaw3d/Xaw3d-1.5-r1.ebuild deleted file mode 100644 index 02f407be76ae..000000000000 --- a/x11-libs/Xaw3d/Xaw3d-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/Xaw3d/Xaw3d-1.5-r1.ebuild,v 1.40 2011/07/12 18:02:12 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}.tar.gz - http://ibiblio.org/pub/X11/contrib/widgets/Xaw3d/R6.3/${P}.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}.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 - 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 -} diff --git a/x11-libs/Xaw3d/files/Xaw3d-out-of-tree.diff b/x11-libs/Xaw3d/files/Xaw3d-out-of-tree.diff deleted file mode 100644 index 41af529025e2..000000000000 --- a/x11-libs/Xaw3d/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/Xaw3d/files/Xaw3d-xfree86.diff b/x11-libs/Xaw3d/files/Xaw3d-xfree86.diff deleted file mode 100644 index a7665e36e7c2..000000000000 --- a/x11-libs/Xaw3d/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 -+#if !defined(__linux__) - #include -+#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/Xaw3d/metadata.xml b/x11-libs/Xaw3d/metadata.xml deleted file mode 100644 index 01c4c004e735..000000000000 --- a/x11-libs/Xaw3d/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -x11 - diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog index 6d6ee355f988..0490e9ad51f3 100644 --- a/x11-libs/vte/ChangeLog +++ b/x11-libs/vte/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/vte # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.284 2011/07/09 16:23:20 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.285 2011/08/02 05:34:57 mattst88 Exp $ + + 11 Jul 2011; Matt Turner vte-0.28.1-r200.ebuild, + vte-0.28.1-r300.ebuild: + Added ~mips, bug 364693 09 Jul 2011; Raúl Porcel vte-0.28.1-r200.ebuild: alpha/arm/ia64/sh/sparc stable wrt #371320 diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest index 45dc35166ada..60f4166e2666 100644 --- a/x11-libs/vte/Manifest +++ b/x11-libs/vte/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX vte-0.28.0-fix-gdk-targets.patch 1302 RMD160 953e83b5f39d02278d69b95601a6d35f3b733544 SHA1 2b5fd8289ce58d9795c3627b7b289bd7f6442b62 SHA256 f3886e0e8a580010a71e0cce47c124b97ef78988ee031c1212c4707b0cd50828 DIST vte-0.26.2.tar.bz2 1310863 RMD160 22a2217f69c2f64090a9d45105047fb1a440b07f SHA1 4c8fb07403538b7f743ec1d7af7b127683c7b9c2 SHA256 f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd DIST vte-0.28.1.tar.xz 963496 RMD160 48b6423cc688a07d7864738dd864261b33313aae SHA1 528191c07aaf7f315fba7585bd427616a56dedd1 SHA256 ad1b868356e0231c42ac2493d3e2a7726014c9dc4110ec89fbb01aee8c2ed7ad EBUILD vte-0.26.2.ebuild 1400 RMD160 4555a4c1836edbbe59293e1655038b7b13ace489 SHA1 6eec8d3088bc0ee7cd68bbd6a5f0c8f6a64183e2 SHA256 b6def081fe98a32254751c0b189fabca3206a0c2fbae79cdbc70acdb37234d2b -EBUILD vte-0.28.1-r200.ebuild 1450 RMD160 33b97c96c353a14d95fafd1005607dbbf6451da2 SHA1 b85a3c9d38bc2abca962387e542486180755108a SHA256 18edb989594be35c0fa7553244bb0392607ff9aec64fb7495dddfea11f0aff35 -EBUILD vte-0.28.1-r300.ebuild 1452 RMD160 95ff25d7ccf779b97cf2578565ee167fb8667daf SHA1 14d5dca4c456e40073dfffc3e4f3aaab39c7683d SHA256 42a94f55af9f5a9f6abbe82eea2da75dc4bc16edd8dcc3a669176736c6468f72 -MISC ChangeLog 37298 RMD160 c32a7be3a10ad24c9d486f1db20faaedc1a89814 SHA1 b9b1baf86f5e057f72bc6227541fd500bb8d1e89 SHA256 919ad310e849eeb5699edd766a06ad671a584f95383f56e38a81f72ce5ff1d72 +EBUILD vte-0.28.1-r200.ebuild 1456 RMD160 cc4b510410615f5ed966a26edafdf154e8f63264 SHA1 b5debc9718548cd73ce5d9f86a10cdb298946896 SHA256 cad648fc4cd02e4f534dd52a25d91c2b6be1398be3e32165c042cf8078081ed9 +EBUILD vte-0.28.1-r300.ebuild 1458 RMD160 3831b8b5c53314cc47335abefcb7974d3463ab50 SHA1 6f0b9d6fb0e0ccec71fbee1822915a6d9593f328 SHA256 620bcc6670be8f077237ed8fb8c4c6e73eea13ede45233083ab6ac53bdf2d257 +MISC ChangeLog 37424 RMD160 450437b1dbcaccaca13014eec0deafec0c148985 SHA1 58da9eeaf4137ce79a02482225b757c9a9b35d52 SHA256 ab12809afba0717a139392088261b8c72542291e19f707e3951ab87981f3b1d1 MISC metadata.xml 350 RMD160 c81d1e1776ed27ef7418cdc46a686e2b6a9dbdeb SHA1 8063a6278411458adbfa260f11d53687a6881f3b SHA256 16e77360aaa3f204d03bfad2997aabf51d51c3360f59f6c4d5f24076e9bae0d1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk4YgH4ACgkQuQc30/atMkC8pQCfWBYu9LBfyBj4p3JZ5pOLDAM8 -THAAoLQVMVkKRwK7SLCQC37IPan1hKD1 -=oXn/ ------END PGP SIGNATURE----- diff --git a/x11-libs/vte/vte-0.28.1-r200.ebuild b/x11-libs/vte/vte-0.28.1-r200.ebuild index b2af41fbf598..44de1d6b2773 100644 --- a/x11-libs/vte/vte-0.28.1-r200.ebuild +++ b/x11-libs/vte/vte-0.28.1-r200.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.1-r200.ebuild,v 1.8 2011/07/09 16:23:20 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.1-r200.ebuild,v 1.9 2011/08/02 05:34:57 mattst88 Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -15,7 +15,7 @@ HOMEPAGE="http://git.gnome.org/browse/vte" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" IUSE="debug doc glade +introspection python" PDEPEND="x11-libs/gnome-pty-helper" diff --git a/x11-libs/vte/vte-0.28.1-r300.ebuild b/x11-libs/vte/vte-0.28.1-r300.ebuild index 409018bd5e69..fdce101484aa 100644 --- a/x11-libs/vte/vte-0.28.1-r300.ebuild +++ b/x11-libs/vte/vte-0.28.1-r300.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.1-r300.ebuild,v 1.2 2011/06/15 06:44:42 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.1-r300.ebuild,v 1.3 2011/08/02 05:34:57 mattst88 Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -14,7 +14,7 @@ HOMEPAGE="http://git.gnome.org/browse/vte" LICENSE="LGPL-2" SLOT="2.90" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="debug doc glade +introspection" PDEPEND="x11-libs/gnome-pty-helper" -- 2.26.2