* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-2.eclass gnustep-base.eclass
@ 2008-10-03 14:59 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2008-10-03 14:59 UTC (permalink / raw
To: gentoo-commits
voyageur 08/10/03 14:59:42
Modified: gnustep-2.eclass gnustep-base.eclass
Log:
Add EAPI=2 support (src_configure) in gnustep eclasses
Revision Changes Path
1.3 eclass/gnustep-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?r1=1.2&r2=1.3
Index: gnustep-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnustep-2.eclass 6 Jan 2008 19:30:24 -0000 1.2
+++ gnustep-2.eclass 3 Oct 2008 14:59:42 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.2 2008/01/06 19:30:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.3 2008/10/03 14:59:42 voyageur Exp $
inherit gnustep-base
@@ -15,6 +15,7 @@
# The following gnustep-based EXPORT_FUNCTIONS are available:
# * gnustep-base_pkg_setup
+# * gnustep-base_src_configure (EAPI=2 only)
# * gnustep-base_src_compile
# * gnustep-base_src_install
# * gnustep-base_pkg_postinst
1.8 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.7&r2=1.8
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnustep-base.eclass 4 Sep 2008 08:04:47 -0000 1.7
+++ gnustep-base.eclass 3 Oct 2008 14:59:42 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.7 2008/09/04 08:04:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.8 2008/10/03 14:59:42 voyageur Exp $
inherit eutils flag-o-matic
@@ -57,11 +57,19 @@
fi
}
-gnustep-base_src_compile() {
+gnustep-base_src_configure() {
egnustep_env
if [[ -x ./configure ]] ; then
econf || die "configure failed"
fi
+}
+
+gnustep-base_src_compile() {
+ egnustep_env
+ case ${EAPI:-0} in
+ 0|1) gnustep-base_src_configure ;;
+ esac
+
egnustep_make
}
@@ -212,4 +220,7 @@
doexe "${T}"/${cfile}
}
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst
+case ${EAPI:-0} in
+ 0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst ;;
+ 2) EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_install pkg_postinst ;;
+esac
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-2.eclass gnustep-base.eclass
@ 2009-11-25 10:11 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2009-11-25 10:11 UTC (permalink / raw
To: gentoo-commits
voyageur 09/11/25 10:11:40
Modified: gnustep-2.eclass gnustep-base.eclass
Log:
Add src_prepare support
Revision Changes Path
1.4 eclass/gnustep-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?r1=1.3&r2=1.4
Index: gnustep-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnustep-2.eclass 3 Oct 2008 14:59:42 -0000 1.3
+++ gnustep-2.eclass 25 Nov 2009 10:11:40 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.3 2008/10/03 14:59:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.4 2009/11/25 10:11:40 voyageur Exp $
inherit gnustep-base
@@ -15,7 +15,9 @@
# The following gnustep-based EXPORT_FUNCTIONS are available:
# * gnustep-base_pkg_setup
-# * gnustep-base_src_configure (EAPI=2 only)
+# * gnustep-base_src_unpack (EAPI 0|1 only)
+# * gnustep-base_src_prepare (EAPI>=2 only)
+# * gnustep-base_src_configure (EAPI>=2 only)
# * gnustep-base_src_compile
# * gnustep-base_src_install
# * gnustep-base_pkg_postinst
1.13 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.12&r2=1.13
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnustep-base.eclass 23 Sep 2009 21:23:56 -0000 1.12
+++ gnustep-base.eclass 25 Nov 2009 10:11:40 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.12 2009/09/23 21:23:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.13 2009/11/25 10:11:40 voyageur Exp $
inherit eutils flag-o-matic
@@ -40,6 +40,10 @@
unpack ${A}
cd "${S}"
+ gnustep-base_src_prepare
+}
+
+gnustep-base_src_prepare() {
if [[ -f ./GNUmakefile ]] ; then
# Kill stupid includes that are simply overdone or useless on normal
# Gentoo, but (may) cause major headaches on Prefixed Gentoo. If this
@@ -223,5 +227,5 @@
case ${EAPI:-0} in
0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst ;;
- 2) EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_install pkg_postinst ;;
+ 2) EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst ;;
esac
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-2.eclass gnustep-base.eclass
@ 2011-04-20 20:48 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2011-04-20 20:48 UTC (permalink / raw
To: gentoo-commits
voyageur 11/04/20 20:48:47
Modified: gnustep-2.eclass gnustep-base.eclass
Log:
GNUstep eclasses update: suppport new layout, clean headers
Revision Changes Path
1.5 eclass/gnustep-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-2.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-2.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-2.eclass?r1=1.4&r2=1.5
Index: gnustep-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnustep-2.eclass 25 Nov 2009 10:11:40 -0000 1.4
+++ gnustep-2.eclass 20 Apr 2011 20:48:47 -0000 1.5
@@ -1,12 +1,16 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.4 2009/11/25 10:11:40 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.5 2011/04/20 20:48:47 voyageur Exp $
-inherit gnustep-base
+# @ECLASS: gnustep-2.eclass
+# @MAINTAINER:
+# GNUstep Herd <gnustep@gentoo.org>
+# @BLURB: eclass for GNUstep Apps, Frameworks, and Bundles build
+# @DESCRIPTION:
+# This eclass sets up GNUstep environment to properly install
+# GNUstep packages
-# Eclass for GNUstep Apps, Frameworks, and Bundles build
-#
-# maintainer: GNUstep Herd <gnustep@gentoo.org>
+inherit gnustep-base
DEPEND=">=gnustep-base/gnustep-make-2.0
virtual/gnustep-back"
1.16 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?r1=1.15&r2=1.16
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnustep-base.eclass 10 Mar 2010 13:19:06 -0000 1.15
+++ gnustep-base.eclass 20 Apr 2011 20:48:47 -0000 1.16
@@ -1,13 +1,16 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.15 2010/03/10 13:19:06 voyageur Exp $
-
-inherit eutils flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.16 2011/04/20 20:48:47 voyageur Exp $
+# @ECLASS: gnustep-base.eclass
+# @MAINTAINER:
+# GNUstep Herd <gnustep@gentoo.org>
+# @BLURB: Internal handling of GNUstep pacakges
+# @DESCRIPTION:
# Inner gnustep eclass, should only be inherited directly by gnustep-base
# packages
-#
-# maintainer: GNUstep Herd <gnustep@gentoo.org>
+
+inherit eutils flag-o-matic
# IUSE variables across all GNUstep packages
# "debug": enable code for debugging
@@ -17,7 +20,8 @@
# packages needed to build any base gnustep package
GNUSTEP_CORE_DEPEND="doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html )"
-# Where to install GNUstep
+# New layout is used when ${EPREFIX}/usr/share/GNUstep/Makefiles exists
+# Where to install GNUstep (with old layout)
GNUSTEP_PREFIX="${EPREFIX}/usr/GNUstep"
# GNUstep environment array
@@ -89,8 +93,14 @@
gnustep-base_pkg_postinst() {
[[ $(type -t gnustep_config_script) != "function" ]] && return 0
+ local SCRIPT_PATH
+ if [[ -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then
+ SCRIPT_PATH="/usr/bin"
+ else
+ SCRIPT_PATH=${GNUSTEP_SYSTEM_TOOLS}/Gentoo
+ fi
elog "To use this package, as *user* you should run:"
- elog " ${GNUSTEP_SYSTEM_TOOLS}/Gentoo/config-${PN}.sh"
+ elog " ${SCRIPT_PATH}/config-${PN}.sh"
}
# Clean/reset an ebuild to the installed GNUstep environment
@@ -98,22 +108,31 @@
# Get additional variables
GNUSTEP_SH_EXPORT_ALL_VARIABLES="true"
- if [[ -f ${GNUSTEP_PREFIX}/System/Library/Makefiles/GNUstep.sh ]] ; then
+ # Makefiles path
+ local GS_MAKEFILES
+ if [[ -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then
+ GS_MAKEFILES=${EPREFIX}/usr/share/GNUstep/Makefiles
+ else
+ GS_MAKEFILES=${GNUSTEP_PREFIX}/System/Library/Makefiles
+ fi
+ if [[ -f ${GS_MAKEFILES}/GNUstep.sh ]] ; then
# Reset GNUstep variables
- source "${GNUSTEP_PREFIX}"/System/Library/Makefiles/GNUstep-reset.sh
- source "${GNUSTEP_PREFIX}"/System/Library/Makefiles/GNUstep.sh
+ source "${GS_MAKEFILES}"/GNUstep-reset.sh
+ source "${GS_MAKEFILES}"/GNUstep.sh
# Needed to run installed GNUstep apps in sandbox
addpredict "/root/GNUstep"
- # Set rpath in ldflags when available
- case ${CHOST} in
- *-linux-gnu|*-solaris*)
- is-ldflagq -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \
- || append-ldflags \
- -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}"
- ;;
- esac
+ if [[ ! -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then
+ # Set rpath in ldflags when available
+ case ${CHOST} in
+ *-linux-gnu|*-solaris*)
+ is-ldflagq -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \
+ || append-ldflags \
+ -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}"
+ ;;
+ esac
+ fi
# Set up env vars for make operations
GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \
@@ -124,11 +143,8 @@
GNUSTEP_USER_DEFAULTS_DIR="${T}"/Defaults \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
- messages=yes )
-
- # Parallel-make support was added in gnustep-make 2.2.0
- has_version "<gnustep-base/gnustep-make-2.2.0" \
- && GS_ENV=( "${GS_ENV[@]}" "-j1" )
+ messages=yes \
+ -j1 )
use debug \
&& GS_ENV=( "${GS_ENV[@]}" "debug=yes" ) \
@@ -150,8 +166,10 @@
# Make-install utilizing GNUstep Makefiles
egnustep_install() {
- # avoid problems due to our "weird" prefix, make sure it exists
- mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS}
+ if [[ ! -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then
+ # avoid problems due to our "weird" prefix, make sure it exists
+ mkdir -p "${D}"${GNUSTEP_SYSTEM_TOOLS}
+ fi
if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
emake ${*} "${GS_ENV[@]}" install || die "package install failed"
return 0
@@ -221,7 +239,11 @@
done
echo 'echo "done"' >> "${T}"/${cfile}
- exeinto ${GNUSTEP_SYSTEM_TOOLS#${EPREFIX}}/Gentoo
+ if [[ -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then
+ exeinto /usr/bin
+ else
+ exeinto ${GNUSTEP_SYSTEM_TOOLS#${EPREFIX}}/Gentoo
+ fi
doexe "${T}"/${cfile}
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-20 20:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-20 20:48 [gentoo-commits] gentoo-x86 commit in eclass: gnustep-2.eclass gnustep-base.eclass Bernard Cafarelli (voyageur)
-- strict thread matches above, loose matches on Subject: below --
2009-11-25 10:11 Bernard Cafarelli (voyageur)
2008-10-03 14:59 Bernard Cafarelli (voyageur)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox