* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2007-09-17 10:58 Fabian Groffen (grobian)
0 siblings, 0 replies; 13+ messages in thread
From: Fabian Groffen (grobian) @ 2007-09-17 10:58 UTC (permalink / raw
To: gentoo-commits
grobian 07/09/17 10:58:04
Modified: gnustep-base.eclass
Log:
avoid setting ld-flags more than once, by querying them first using is-ldflagq
Revision Changes Path
1.3 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.2&r2=1.3
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnustep-base.eclass 19 Aug 2007 18:15:04 -0000 1.2
+++ gnustep-base.eclass 17 Sep 2007 10:58:04 -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-base.eclass,v 1.2 2007/08/19 18:15:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.3 2007/09/17 10:58:04 grobian Exp $
inherit eutils flag-o-matic
@@ -98,15 +98,14 @@
# Set rpath in ldflags when available
case ${CHOST} in
*-linux-gnu|*-solaris*)
- append-ldflags \
- -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \
- -L"${GNUSTEP_SYSTEM_LIBRARIES}"
- ;;
- *)
- append-ldflags \
- -L"${GNUSTEP_SYSTEM_LIBRARIES}"
+ is-ldflagq -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}" \
+ || append-ldflags \
+ -Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}"
;;
esac
+ is-ldflagq -L"${GNUSTEP_SYSTEM_LIBRARIES}" \
+ || append-ldflags \
+ -L"${GNUSTEP_SYSTEM_LIBRARIES}"
# Set up env vars for make operations
GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2007-10-05 10:51 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2007-10-05 10:51 UTC (permalink / raw
To: gentoo-commits
voyageur 07/10/05 10:51:21
Modified: gnustep-base.eclass
Log:
Update convenience scripts generation from the gnustep overlay
Revision Changes Path
1.4 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.3&r2=1.4
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnustep-base.eclass 17 Sep 2007 10:58:04 -0000 1.3
+++ gnustep-base.eclass 5 Oct 2007 10:51:20 -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-base.eclass,v 1.3 2007/09/17 10:58:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.4 2007/10/05 10:51:20 voyageur Exp $
inherit eutils flag-o-matic
@@ -166,8 +166,43 @@
local cfile=config-${PN}.sh
- echo '#!/usr/bin/env bash' > "${T}"/${cfile}
- echo "echo Applying ${P} default configuration ..." >> "${T}"/${cfile}
+ cat << EOF > "${T}"/${cfile}
+#!/usr/bin/env bash
+gnustep_append_default() {
+ if [[ -z \$1 || -z \$2 || -z \$3 ]]; then
+ echo "warning: invalid script invocation"
+ return
+ fi
+ dom=\$1
+ key=\$2
+ val=\$3
+ cur=\$(defaults read \${dom} \${key}) 2> /dev/null
+ if [[ -z \$cur ]] ; then
+ echo " * setting \${dom} \${key}"
+ defaults write \${dom} \${key} "( \${val} )"
+ elif [[ \${cur} != *\${val}* ]] ; then
+ echo " * adding \${val} to \${dom} \${key}"
+ echo "\${cur%)\'}, \"\${val}\" )'" | defaults write
+ else
+ echo " * \${val} already present in \${dom} \${key}"
+ fi
+}
+
+gnustep_set_default() {
+ if [[ -z \$1 || -z \$2 || -z \$3 ]]; then
+ echo "warning: invalid script invocation"
+ return
+ fi
+ dom=\$1
+ key=\$2
+ val=\$3
+ echo " * setting \${dom} \${key}"
+ defaults write \${dom} \${key} \${val}
+}
+
+echo "Applying ${P} default configuration ..."
+EOF
+
gnustep_config_script | \
while read line ; do
echo "${line}" >> "${T}"/${cfile}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2007-10-08 19:34 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2007-10-08 19:34 UTC (permalink / raw
To: gentoo-commits
voyageur 07/10/08 19:34:04
Modified: gnustep-base.eclass
Log:
Remove most backslashes in convenience script, thanks dirtyepic!
Revision Changes Path
1.5 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.4&r2=1.5
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnustep-base.eclass 5 Oct 2007 10:51:20 -0000 1.4
+++ gnustep-base.eclass 8 Oct 2007 19:34:04 -0000 1.5
@@ -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.4 2007/10/05 10:51:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.5 2007/10/08 19:34:04 voyageur Exp $
inherit eutils flag-o-matic
@@ -166,43 +166,44 @@
local cfile=config-${PN}.sh
- cat << EOF > "${T}"/${cfile}
+ cat << 'EOF' > "${T}"/${cfile}
#!/usr/bin/env bash
gnustep_append_default() {
- if [[ -z \$1 || -z \$2 || -z \$3 ]]; then
+ if [[ -z $1 || -z $2 || -z $3 ]]; then
echo "warning: invalid script invocation"
return
fi
- dom=\$1
- key=\$2
- val=\$3
- cur=\$(defaults read \${dom} \${key}) 2> /dev/null
- if [[ -z \$cur ]] ; then
- echo " * setting \${dom} \${key}"
- defaults write \${dom} \${key} "( \${val} )"
- elif [[ \${cur} != *\${val}* ]] ; then
- echo " * adding \${val} to \${dom} \${key}"
- echo "\${cur%)\'}, \"\${val}\" )'" | defaults write
+ dom=$1
+ key=$2
+ val=$3
+ cur=$(defaults read ${dom} ${key}) 2> /dev/null
+ if [[ -z $cur ]] ; then
+ echo " * setting ${dom} ${key}"
+ defaults write ${dom} ${key} "( ${val} )"
+ elif [[ ${cur} != *${val}* ]] ; then
+ echo " * adding ${val} to ${dom} ${key}"
+ echo "${cur%)\'}, \"${val}\" )'" | defaults write
else
- echo " * \${val} already present in \${dom} \${key}"
+ echo " * ${val} already present in ${dom} ${key}"
fi
}
gnustep_set_default() {
- if [[ -z \$1 || -z \$2 || -z \$3 ]]; then
+ if [[ -z $1 || -z $2 || -z $3 ]]; then
echo "warning: invalid script invocation"
return
fi
- dom=\$1
- key=\$2
- val=\$3
- echo " * setting \${dom} \${key}"
- defaults write \${dom} \${key} \${val}
+ dom=$1
+ key=$2
+ val=$3
+ echo " * setting ${dom} ${key}"
+ defaults write ${dom} ${key} ${val}
}
-echo "Applying ${P} default configuration ..."
EOF
+ echo "echo \"Applying ${P} default configuration ...\"" >> "${T}"/${cfile}
+
gnustep_config_script | \
while read line ; do
echo "${line}" >> "${T}"/${cfile}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2008-01-04 12:27 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2008-01-04 12:27 UTC (permalink / raw
To: gentoo-commits
voyageur 08/01/04 12:27:10
Modified: gnustep-base.eclass
Log:
Fix linker search path order, thanks to ADDITIONAL_NATIVE_LIB_DIRS variable
Revision Changes Path
1.6 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.5&r2=1.6
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnustep-base.eclass 8 Oct 2007 19:34:04 -0000 1.5
+++ gnustep-base.eclass 4 Jan 2008 12:27:10 -0000 1.6
@@ -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.5 2007/10/08 19:34:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.6 2008/01/04 12:27:10 voyageur Exp $
inherit eutils flag-o-matic
@@ -103,12 +103,10 @@
-Wl,-rpath="${GNUSTEP_SYSTEM_LIBRARIES}"
;;
esac
- is-ldflagq -L"${GNUSTEP_SYSTEM_LIBRARIES}" \
- || append-ldflags \
- -L"${GNUSTEP_SYSTEM_LIBRARIES}"
# Set up env vars for make operations
GS_ENV=( AUXILIARY_LDFLAGS="${LDFLAGS}" \
+ ADDITIONAL_NATIVE_LIB_DIRS="${GNUSTEP_SYSTEM_LIBRARIES}" \
DESTDIR="${D}" \
HOME="${T}" \
GNUSTEP_USER_DIR="${T}" \
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2008-09-04 8:04 Christian Faulhammer (opfer)
0 siblings, 0 replies; 13+ messages in thread
From: Christian Faulhammer (opfer) @ 2008-09-04 8:04 UTC (permalink / raw
To: gentoo-commits
opfer 08/09/04 08:04:48
Modified: gnustep-base.eclass
Log:
adjust dependency from virtual/tetex to virtual/texi2dvi
Revision Changes Path
1.7 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.6&r2=1.7
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnustep-base.eclass 4 Jan 2008 12:27:10 -0000 1.6
+++ gnustep-base.eclass 4 Sep 2008 08:04:47 -0000 1.7
@@ -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.6 2008/01/04 12:27:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.7 2008/09/04 08:04:47 opfer Exp $
inherit eutils flag-o-matic
@@ -16,7 +16,7 @@
# packages needed to build any base gnustep package
GNUSTEP_CORE_DEPEND="virtual/libc
- doc? ( virtual/tetex =dev-tex/latex2html-2002* >=app-text/texi2html-1.64 )"
+ doc? ( virtual/texi2dvi =dev-tex/latex2html-2002* >=app-text/texi2html-1.64 )"
# Where to install GNUstep
GNUSTEP_PREFIX="/usr/GNUstep"
@@ -187,14 +187,14 @@
}
gnustep_set_default() {
- if [[ -z $1 || -z $2 || -z $3 ]]; then
- echo "warning: invalid script invocation"
- return
- fi
- dom=$1
- key=$2
- val=$3
- echo " * setting ${dom} ${key}"
+ if [[ -z $1 || -z $2 || -z $3 ]]; then
+ echo "warning: invalid script invocation"
+ return
+ fi
+ dom=$1
+ key=$2
+ val=$3
+ echo " * setting ${dom} ${key}"
defaults write ${dom} ${key} ${val}
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2008-12-03 14:29 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2008-12-03 14:29 UTC (permalink / raw
To: gentoo-commits
voyageur 08/12/03 14:29:05
Modified: gnustep-base.eclass
Log:
Update doc DEPEND
Revision Changes Path
1.9 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.8&r2=1.9
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnustep-base.eclass 3 Oct 2008 14:59:42 -0000 1.8
+++ gnustep-base.eclass 3 Dec 2008 14:29:05 -0000 1.9
@@ -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.8 2008/10/03 14:59:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.9 2008/12/03 14:29:05 voyageur Exp $
inherit eutils flag-o-matic
@@ -16,7 +16,7 @@
# packages needed to build any base gnustep package
GNUSTEP_CORE_DEPEND="virtual/libc
- doc? ( virtual/texi2dvi =dev-tex/latex2html-2002* >=app-text/texi2html-1.64 )"
+ doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html )"
# Where to install GNUstep
GNUSTEP_PREFIX="/usr/GNUstep"
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2009-05-11 10:58 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2009-05-11 10:58 UTC (permalink / raw
To: gentoo-commits
voyageur 09/05/11 10:58:42
Modified: gnustep-base.eclass
Log:
Parallel-make support was added in gnustep-make 2.2.0
Revision Changes Path
1.10 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.9&r2=1.10
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnustep-base.eclass 3 Dec 2008 14:29:05 -0000 1.9
+++ gnustep-base.eclass 11 May 2009 10:58:42 -0000 1.10
@@ -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.9 2008/12/03 14:29:05 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.10 2009/05/11 10:58:42 voyageur Exp $
inherit eutils flag-o-matic
@@ -121,9 +121,11 @@
GNUSTEP_USER_DEFAULTS_DIR="${T}"/Defaults \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
- messages=yes \
- -j1 )
- # -j1 is needed as gnustep-make is not parallel-safe
+ 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" )
use debug \
&& GS_ENV=( "${GS_ENV[@]}" "debug=yes" ) \
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2009-07-06 19:55 Fabian Groffen (grobian)
0 siblings, 0 replies; 13+ messages in thread
From: Fabian Groffen (grobian) @ 2009-07-06 19:55 UTC (permalink / raw
To: gentoo-commits
grobian 09/07/06 19:55:55
Modified: gnustep-base.eclass
Log:
fix test to actually work as expected
Revision Changes Path
1.11 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.10&r2=1.11
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnustep-base.eclass 11 May 2009 10:58:42 -0000 1.10
+++ gnustep-base.eclass 6 Jul 2009 19:55:55 -0000 1.11
@@ -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.10 2009/05/11 10:58:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.11 2009/07/06 19:55:55 grobian Exp $
inherit eutils flag-o-matic
@@ -138,7 +138,7 @@
# Make utilizing GNUstep Makefiles
egnustep_make() {
- if [[ -f ./[mM]akefile || -f ./GNUmakefile ]] ; then
+ if [[ -f ./Makefile || -f ./makefile || -f ./GNUmakefile ]] ; then
emake ${*} "${GS_ENV[@]}" all || die "package make failed"
return 0
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2009-12-05 16:10 Fabian Groffen (grobian)
0 siblings, 0 replies; 13+ messages in thread
From: Fabian Groffen (grobian) @ 2009-12-05 16:10 UTC (permalink / raw
To: gentoo-commits
grobian 09/12/05 16:10:30
Modified: gnustep-base.eclass
Log:
Make compatible for Prefix
Revision Changes Path
1.14 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.13&r2=1.14
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnustep-base.eclass 25 Nov 2009 10:11:40 -0000 1.13
+++ gnustep-base.eclass 5 Dec 2009 16:10:30 -0000 1.14
@@ -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.13 2009/11/25 10:11:40 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.14 2009/12/05 16:10:30 grobian Exp $
inherit eutils flag-o-matic
@@ -18,7 +18,7 @@
GNUSTEP_CORE_DEPEND="doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html )"
# Where to install GNUstep
-GNUSTEP_PREFIX="/usr/GNUstep"
+GNUSTEP_PREFIX="${EPREFIX}/usr/GNUstep"
# GNUstep environment array
typeset -a GS_ENV
@@ -221,7 +221,7 @@
done
echo 'echo "done"' >> "${T}"/${cfile}
- exeinto ${GNUSTEP_SYSTEM_TOOLS}/Gentoo
+ exeinto ${GNUSTEP_SYSTEM_TOOLS#${EPREFIX}}/Gentoo
doexe "${T}"/${cfile}
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2010-03-10 13:19 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2010-03-10 13:19 UTC (permalink / raw
To: gentoo-commits
voyageur 10/03/10 13:19:07
Modified: gnustep-base.eclass
Log:
Allow EAPI=>3 usage (so EXPORT_FONCTIONS works on new gnustep-base)
Revision Changes Path
1.15 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.14&r2=1.15
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnustep-base.eclass 5 Dec 2009 16:10:30 -0000 1.14
+++ gnustep-base.eclass 10 Mar 2010 13:19:06 -0000 1.15
@@ -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.14 2009/12/05 16:10:30 grobian Exp $
+# $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
@@ -227,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_prepare src_configure src_compile src_install pkg_postinst ;;
+ *) EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst ;;
esac
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2011-06-06 19:17 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2011-06-06 19:17 UTC (permalink / raw
To: gentoo-commits
voyageur 11/06/06 19:17:38
Modified: gnustep-base.eclass
Log:
Use modified GNUstep.conf for compilation, should fix bug #366795
Revision Changes Path
1.17 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?r1=1.16&r2=1.17
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnustep-base.eclass 20 Apr 2011 20:48:47 -0000 1.16
+++ gnustep-base.eclass 6 Jun 2011 19:17:38 -0000 1.17
@@ -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.16 2011/04/20 20:48:47 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.17 2011/06/06 19:17:38 voyageur Exp $
# @ECLASS: gnustep-base.eclass
# @MAINTAINER:
@@ -120,8 +120,15 @@
source "${GS_MAKEFILES}"/GNUstep-reset.sh
source "${GS_MAKEFILES}"/GNUstep.sh
- # Needed to run installed GNUstep apps in sandbox
- addpredict "/root/GNUstep"
+ # Create compilation GNUstep.conf if it does not exist yet
+ if [[ ! -f ${T}/GNUstep.conf ]]; then
+ cp "${EPREFIX}"/etc/GNUstep/GNUstep.conf "${T}" \
+ || die "GNUstep.conf copy failed"
+ sed -e "s#\(GNUSTEP_USER_DIR=\).*#\1${T}#" \
+ -e "s#\(GNUSTEP_USER_DEFAULTS_DIR=\).*#\1${T}/Defaults#" \
+ -i "${T}"/GNUstep.conf || die "GNUstep.conf sed failed"
+ fi
+
if [[ ! -d ${EPREFIX}/usr/share/GNUstep/Makefiles ]]; then
# Set rpath in ldflags when available
@@ -139,6 +146,7 @@
ADDITIONAL_NATIVE_LIB_DIRS="${GNUSTEP_SYSTEM_LIBRARIES}" \
DESTDIR="${D}" \
HOME="${T}" \
+ GNUSTEP_CONFIG_FILE="${T}"/GNUstep.conf \
GNUSTEP_USER_DIR="${T}" \
GNUSTEP_USER_DEFAULTS_DIR="${T}"/Defaults \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2011-06-08 8:55 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2011-06-08 8:55 UTC (permalink / raw
To: gentoo-commits
voyageur 11/06/08 08:55:55
Modified: gnustep-base.eclass
Log:
Fix for r1.16 changes: -j1 should have been removed completely
Revision Changes Path
1.18 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?r1=1.17&r2=1.18
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnustep-base.eclass 6 Jun 2011 19:17:38 -0000 1.17
+++ gnustep-base.eclass 8 Jun 2011 08:55:55 -0000 1.18
@@ -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.17 2011/06/06 19:17:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.18 2011/06/08 08:55:55 voyageur Exp $
# @ECLASS: gnustep-base.eclass
# @MAINTAINER:
@@ -151,8 +151,7 @@
GNUSTEP_USER_DEFAULTS_DIR="${T}"/Defaults \
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
TAR_OPTIONS="${TAR_OPTIONS} --no-same-owner" \
- messages=yes \
- -j1 )
+ messages=yes )
use debug \
&& GS_ENV=( "${GS_ENV[@]}" "debug=yes" ) \
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass
@ 2011-06-28 15:27 Bernard Cafarelli (voyageur)
0 siblings, 0 replies; 13+ messages in thread
From: Bernard Cafarelli (voyageur) @ 2011-06-28 15:27 UTC (permalink / raw
To: gentoo-commits
voyageur 11/06/28 15:27:23
Modified: gnustep-base.eclass
Log:
Allow possiblle trailing slashes in src_prepare path cleanup, thanks Rion
Revision Changes Path
1.19 eclass/gnustep-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnustep-base.eclass?r1=1.18&r2=1.19
Index: gnustep-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnustep-base.eclass 8 Jun 2011 08:55:55 -0000 1.18
+++ gnustep-base.eclass 28 Jun 2011 15:27:23 -0000 1.19
@@ -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.18 2011/06/08 08:55:55 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.19 2011/06/28 15:27:23 voyageur Exp $
# @ECLASS: gnustep-base.eclass
# @MAINTAINER:
@@ -55,10 +55,10 @@
# to know when they use some direct include.
ebegin "Cleaning paths from GNUmakefile"
sed -i \
- -e 's|-I/usr/X11R6/include||g' \
- -e 's|-I/usr/include||g' \
- -e 's|-L/usr/X11R6/lib||g' \
- -e 's|-L/usr/lib||g' \
+ -e 's|-I/usr/X11R6/include/\?||g' \
+ -e 's|-I/usr/include/\?||g' \
+ -e 's|-L/usr/X11R6/lib/\?||g' \
+ -e 's|-L/usr/lib/\?||g' \
GNUmakefile
eend $?
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-06-28 15:27 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-17 10:58 [gentoo-commits] gentoo-x86 commit in eclass: gnustep-base.eclass Fabian Groffen (grobian)
-- strict thread matches above, loose matches on Subject: below --
2007-10-05 10:51 Bernard Cafarelli (voyageur)
2007-10-08 19:34 Bernard Cafarelli (voyageur)
2008-01-04 12:27 Bernard Cafarelli (voyageur)
2008-09-04 8:04 Christian Faulhammer (opfer)
2008-12-03 14:29 Bernard Cafarelli (voyageur)
2009-05-11 10:58 Bernard Cafarelli (voyageur)
2009-07-06 19:55 Fabian Groffen (grobian)
2009-12-05 16:10 Fabian Groffen (grobian)
2010-03-10 13:19 Bernard Cafarelli (voyageur)
2011-06-06 19:17 Bernard Cafarelli (voyageur)
2011-06-08 8:55 Bernard Cafarelli (voyageur)
2011-06-28 15:27 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