diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2012-12-20 15:08:03 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-12-20 15:08:03 +0000 |
commit | c9367b119ca71bf3e0d186389f37c54ff4fc45cd (patch) | |
tree | 4b23b1811ef79499c8343d867e0aa97b3e11119c /gnustep-base | |
parent | Remove version using old gnustep layout (diff) | |
download | gentoo-2-c9367b119ca71bf3e0d186389f37c54ff4fc45cd.tar.gz gentoo-2-c9367b119ca71bf3e0d186389f37c54ff4fc45cd.tar.bz2 gentoo-2-c9367b119ca71bf3e0d186389f37c54ff4fc45cd.zip |
Remove version using old gnustep layout
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Diffstat (limited to 'gnustep-base')
-rw-r--r-- | gnustep-base/gnustep-make/ChangeLog | 6 | ||||
-rw-r--r-- | gnustep-base/gnustep-make/files/gnustep-3.csh | 19 | ||||
-rw-r--r-- | gnustep-base/gnustep-make/files/gnustep-3.sh | 23 | ||||
-rw-r--r-- | gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild | 83 |
4 files changed, 5 insertions, 126 deletions
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog index 3b572ca8aa50..1bbfcf6a81b3 100644 --- a/gnustep-base/gnustep-make/ChangeLog +++ b/gnustep-base/gnustep-make/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnustep-base/gnustep-make # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.113 2012/12/20 13:07:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.114 2012/12/20 15:08:03 voyageur Exp $ + + 20 Dec 2012; Bernard Cafarelli <voyageur@gentoo.org> + -gnustep-make-2.4.0.ebuild, -files/gnustep-3.csh, -files/gnustep-3.sh: + Remove version using old gnustep layout 20 Dec 2012; Agostino Sarubbo <ago@gentoo.org> gnustep-make-2.6.2.ebuild: Stable for sparc, wrt bug #410601 diff --git a/gnustep-base/gnustep-make/files/gnustep-3.csh b/gnustep-base/gnustep-make/files/gnustep-3.csh deleted file mode 100644 index 064753d65330..000000000000 --- a/gnustep-base/gnustep-make/files/gnustep-3.csh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env csh -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/files/gnustep-3.csh,v 1.1 2010/03/09 18:52:56 grobian Exp $ - -# Test for an interactive shell -if ( $?prompt ) then - - setenv GNUSTEP_SYSTEM_TOOLS "@GENTOO_PORTAGE_EPREFIX@"/usr/GNUstep/System/Tools - - if ( -x $GNUSTEP_SYSTEM_TOOLS/make_services ) then - $GNUSTEP_SYSTEM_TOOLS/make_services - endif - - if ( -x $GNUSTEP_SYSTEM_TOOLS/gdnc ) then - $GNUSTEP_SYSTEM_TOOLS/gdnc - endif - -endif diff --git a/gnustep-base/gnustep-make/files/gnustep-3.sh b/gnustep-base/gnustep-make/files/gnustep-3.sh deleted file mode 100644 index 6eb95c8fcf6b..000000000000 --- a/gnustep-base/gnustep-make/files/gnustep-3.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env sh -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/files/gnustep-3.sh,v 1.1 2010/03/09 18:52:56 grobian Exp $ - -# Test for an interactive shell -case $- in - *i*) - ;; - *) - return - ;; -esac - -GNUSTEP_SYSTEM_TOOLS="@GENTOO_PORTAGE_EPREFIX@"/usr/GNUstep/System/Tools - -if [ -x ${GNUSTEP_SYSTEM_TOOLS}/make_services ]; then - ${GNUSTEP_SYSTEM_TOOLS}/make_services -fi - -if [ -x ${GNUSTEP_SYSTEM_TOOLS}/gdnc ]; then - ${GNUSTEP_SYSTEM_TOOLS}/gdnc -fi diff --git a/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild deleted file mode 100644 index 6ffac3f639f6..000000000000 --- a/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild,v 1.7 2011/06/07 13:48:56 voyageur Exp $ - -EAPI="3" - -inherit gnustep-base eutils prefix - -DESCRIPTION="GNUstep Makefile Package" - -HOMEPAGE="http://www.gnustep.org" -SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="native-exceptions" -SLOT="0" -LICENSE="GPL-2" - -DEPEND="${GNUSTEP_CORE_DEPEND} - >=sys-devel/gcc-3.3[objc] - >=sys-devel/make-3.75 - !gnustep-base/libobjc2" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.1-destdir.patch - cp "${FILESDIR}"/gnustep-3.{csh,sh} "${T}"/ - eprefixify "${T}"/gnustep-3.{csh,sh} -} - -src_configure() { - econf \ - --prefix="${GNUSTEP_PREFIX}" \ - --with-layout=gnustep \ - --with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \ - $(use_enable native-exceptions native-objc-exceptions) \ - || die "configure failed" -} - -src_compile() { - emake || die "compilation failed" - # Prepare doc here (needed when no gnustep-make is already installed) - if use doc ; then - # If a gnustep-1 environment is set - unset GNUSTEP_MAKEFILES - cd Documentation - emake all install || die "doc make has failed" - cd .. - fi -} - -src_install() { - # Get GNUSTEP_* variables - . ./GNUstep.conf - - local make_eval - use debug || make_eval="${make_eval} debug=no" - make_eval="${make_eval} verbose=yes" - - emake ${make_eval} DESTDIR="${D}" install || die "install has failed" - - # Copy the documentation - if use doc ; then - dodir ${GNUSTEP_SYSTEM_LIBRARY} - cp -r Documentation/tmp-installation/System/Library/Documentation \ - "${ED}"${GNUSTEP_SYSTEM_LIBRARY} - fi - - dodoc FAQ README RELEASENOTES - - exeinto /etc/profile.d - doexe "${T}"/gnustep-3.sh - doexe "${T}"/gnustep-3.csh - - dodir /etc/env.d - cat <<- EOF > "${ED}"/etc/env.d/99gnustep -PATH=${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS} -ROOTPATH=${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS} -LDPATH=${GNUSTEP_SYSTEM_LIBRARIES}:${GNUSTEP_LOCAL_LIBRARIES} -MANPATH=${GNUSTEP_SYSTEM_DOC_MAN}:${GNUSTEP_LOCAL_DOC_MAN} -INFOPATH=${GNUSTEP_SYSTEM_DOC_INFO}:${GNUSTEP_LOCAL_DOC_INFO} -INFODIR=${GNUSTEP_SYSTEM_DOC_INFO}:${GNUSTEP_LOCAL_DOC_INFO} -EOF -} |