voyageur 15/05/18 14:45:37
Modified: gnustep-make-2.6.6.ebuild ChangeLog
Added: gnustep-make-2.6.7.ebuild
Removed: gnustep-make-2.6.4.ebuild
gnustep-make-2.6.2-r2.ebuild
gnustep-make-2.6.3.ebuild gnustep-make-2.6.5.ebuild
Log:
Version bump, force install path thanks Nick Bowler <nbow...@draconx.ca> in
bug #532196. Drop some versions
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key
00F7AB331B0F097F)
Revision Changes Path
1.2 gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild?r1=1.1&r2=1.2
Index: gnustep-make-2.6.6.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnustep-make-2.6.6.ebuild 29 Jan 2014 14:48:32 -0000 1.1
+++ gnustep-make-2.6.6.ebuild 18 May 2015 14:45:37 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6.6.ebuild,v
1.1 2014/01/29 14:48:32 voyageur Exp $
+# $Header:
/var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild,v
1.2 2015/05/18 14:45:37 voyageur Exp $
EAPI=5
inherit gnustep-base eutils prefix toolchain-funcs
@@ -18,7 +18,7 @@
>=sys-devel/make-3.75
libobjc2? ( gnustep-base/libobjc2
>=sys-devel/clang-2.9 )
- !libobjc2? ( >=sys-devel/gcc-3.3[objc]
+ !libobjc2? ( >=sys-devel/gcc-3.3:=[objc]
!!gnustep-base/libobjc2 )"
RDEPEND="${DEPEND}"
@@ -75,6 +75,7 @@
src_configure() {
#--enable-objc-nonfragile-abi: only working in clang for now
econf \
+ INSTALL="${EPREFIX}"/usr/bin/install \
--with-layout=fhs-system \
--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
--with-objc-lib-flag=-l:${libobjc_version} \
1.121 gnustep-base/gnustep-make/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/ChangeLog?rev=1.121&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/ChangeLog?rev=1.121&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/ChangeLog?r1=1.120&r2=1.121
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog 6 Jun 2014 12:44:31 -0000 1.120
+++ ChangeLog 18 May 2015 14:45:37 -0000 1.121
@@ -1,6 +1,15 @@
# ChangeLog for gnustep-base/gnustep-make
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.120
2014/06/06 12:44:31 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.121
2015/05/18 14:45:37 voyageur Exp $
+
+*gnustep-make-2.6.7 (18 May 2015)
+
+ 18 May 2015; Bernard Cafarelli <voyag...@gentoo.org>
+ -gnustep-make-2.6.2-r2.ebuild, -gnustep-make-2.6.3.ebuild,
+ -gnustep-make-2.6.4.ebuild, -gnustep-make-2.6.5.ebuild,
+ gnustep-make-2.6.6.ebuild, +gnustep-make-2.6.7.ebuild:
+ Version bump, force install path thanks Nick Bowler <nbow...@draconx.ca> in
+ bug #532196. Drop some versions
*gnustep-make-2.6.6 (29 Jan 2014)
1.1 gnustep-base/gnustep-make/gnustep-make-2.6.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.7.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.7.ebuild?rev=1.1&content-type=text/plain
Index: gnustep-make-2.6.7.ebuild
===================================================================
# Copyright 1999-2015 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.6.7.ebuild,v
1.1 2015/05/18 14:45:37 voyageur Exp $
EAPI=5
inherit gnustep-base eutils prefix toolchain-funcs
DESCRIPTION="GNUstep Makefile Package"
HOMEPAGE="http://www.gnustep.org";
SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="libobjc2 native-exceptions"
DEPEND="${GNUSTEP_CORE_DEPEND}
>=sys-devel/make-3.75
libobjc2? ( gnustep-base/libobjc2
>=sys-devel/clang-2.9 )
!libobjc2? ( >=sys-devel/gcc-3.3:=[objc]
!!gnustep-base/libobjc2 )"
RDEPEND="${DEPEND}"
pkg_setup() {
# Determine libobjc.so to use
if use libobjc2; then
libobjc_version=libobjc.so.4
else
# Find version in active gcc
for ver in {2..5};
do
if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} \
"${FILESDIR}"/testlibobjc.m -o /dev/null 2>
/dev/null;
then
libobjc_version=libobjc.so.${ver}
fi
done
fi
# Stop if we could not get libobjc.so
if [[ -z ${libobjc_version} ]]; then
die "Could not find Objective-C runtime"
fi
# For existing installations, determine if we will use another
libobjc.so
if has_version gnustep-base/gnustep-make; then
local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}'
${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
# Old installations did not set this explicitely
: ${current_libobjc:=libobjc.so.2}
if [[ ${current_libobjc} != ${libobjc_version} ]]; then
ewarn "Warning: changed libobjc.so version!!"
ewarn "The libobjc.so version used for gnustep-make has
changed"
ewarn "(either by the libojbc2 use-flag or a GCC
upgrade)"
ewarn "You must rebuild all gnustep packages installed."
ewarn ""
ewarn "To do so, please emerge
gnustep-base/gnustep-updater and run:"
ewarn "# gnustep-updater -l"
fi
fi
if use libobjc2; then
export CC=clang
fi
}
src_prepare() {
# Multilib-strict
sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die
"sed failed"
cp "${FILESDIR}"/gnustep-5.{csh,sh} "${T}"/
eprefixify "${T}"/gnustep-5.{csh,sh}
}
src_configure() {
#--enable-objc-nonfragile-abi: only working in clang for now
econf \
INSTALL="${EPREFIX}"/usr/bin/install \
--with-layout=fhs-system \
--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
--with-objc-lib-flag=-l:${libobjc_version} \
$(use_enable libobjc2 objc-nonfragile-abi) \
$(use_enable native-exceptions native-objc-exceptions)
}
src_compile() {
emake
# 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
pushd Documentation &> /dev/null
emake -j1 all install
popd &> /dev/null
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
# Copy the documentation
if use doc ; then
dodir ${GNUSTEP_SYSTEM_DOC}
cp -r
Documentation/tmp-installation/System/Library/Documentation/* \
"${ED}"${GNUSTEP_SYSTEM_DOC=}
fi
dodoc FAQ README RELEASENOTES
exeinto /etc/profile.d
doexe "${T}"/gnustep-?.sh
doexe "${T}"/gnustep-?.csh
}
pkg_postinst() {
# Warn about new layout if old GNUstep directory is still here
if [ -e /usr/GNUstep/System ]; then
ewarn "Old layout directory detected (/usr/GNUstep/System)"
ewarn "Gentoo has switched to FHS layout for GNUstep packages"
ewarn "You must first update the configuration files from this
package,"
ewarn "then remerge all packages still installed with the old
layout"
ewarn "You can use gnustep-base/gnustep-updater for this task"
fi
}
