diff options
author | Armando Di Cianno <fafhrd@gentoo.org> | 2004-12-13 23:09:06 +0000 |
---|---|---|
committer | Armando Di Cianno <fafhrd@gentoo.org> | 2004-12-13 23:09:06 +0000 |
commit | f396b1b47a5c20b4b3b3833b05db029197143fb7 (patch) | |
tree | 4f656a0cb3e42ee7978ac366b42876b3b6433bb8 /gnustep-base/gnustep-make | |
parent | Removed an extra line. (Manifest recommit) (diff) | |
download | gentoo-2-f396b1b47a5c20b4b3b3833b05db029197143fb7.tar.gz gentoo-2-f396b1b47a5c20b4b3b3833b05db029197143fb7.tar.bz2 gentoo-2-f396b1b47a5c20b4b3b3833b05db029197143fb7.zip |
Cleanup relating to choice of dev-lib/libffi or gcc with gcj or obcj use flag turned on; very information dense error messages now given when objc or libffi is not available; old ebuilds pruned out (one "stable" release, one "cvs fetching" release); "stable" release base libs marked stable on ppc
Diffstat (limited to 'gnustep-base/gnustep-make')
13 files changed, 23 insertions, 640 deletions
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog index dff050c68420..2f53fa4772ba 100644 --- a/gnustep-base/gnustep-make/ChangeLog +++ b/gnustep-base/gnustep-make/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnustep-base/gnustep-make # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.18 2004/12/05 21:36:57 fafhrd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.19 2004/12/13 23:06:59 fafhrd Exp $ + + 13 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> -files/helloworld.m, + gnustep-make-1.10.0-r1.ebuild, -gnustep-make-1.10.0.ebuild, + -gnustep-make-1.10.1_pre20041030-r1.ebuild, + -gnustep-make-1.10.1_pre20041030.ebuild, + -gnustep-make-1.10.1_pre20041116.ebuild, + gnustep-make-1.10.1_pre20041203.ebuild: + Cleaned up detection of objc and libff; general cleanups 05 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> gnustep-make-1.10.1_pre20041203.ebuild: diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest index bf9522b732d5..2a4d2c21a363 100644 --- a/gnustep-base/gnustep-make/Manifest +++ b/gnustep-base/gnustep-make/Manifest @@ -1,17 +1,8 @@ -MD5 1dd1a6eda21348216981bfe902aac512 gnustep-make-1.10.1_pre20041116.ebuild 6804 -MD5 ae1aaa05a220a14b3ecc49095a45deb0 gnustep-make-1.10.0.ebuild 2629 -MD5 438fde2802a4fab9ded98e13fdccc287 gnustep-make-1.10.1_pre20041030.ebuild 2885 -MD5 a5e0f21454d9d7bcd9580992eadf66eb gnustep-make-1.10.0-r1.ebuild 6623 -MD5 d08de5046cf82d5acb49ccaf3ab515d8 gnustep-make-1.10.1_pre20041030-r1.ebuild 6810 -MD5 2e4442f91e1b70c77b8b564f303f64cb ChangeLog 6489 +MD5 0024521e5465f07bdd4e79e0b13a259d gnustep-make-1.10.0-r1.ebuild 6434 +MD5 8e643e2ced7140675ba34585f0d209f9 ChangeLog 6859 MD5 ca04d409726e17e7151b832de9989a48 metadata.xml 530 -MD5 4cdd0e0167d23956cd034f9634dd997d gnustep-make-1.10.1_pre20041203.ebuild 7071 -MD5 4ba1b8533c9b3b56077617796abc9ab6 files/helloworld.m 1004 +MD5 e06e1e19d307e0fee039a5e94c273cdc gnustep-make-1.10.1_pre20041203.ebuild 6617 MD5 fdb13360dfc78ccdc3c75a5da84b46ab files/make-user-defaults.patch-1.10.0 1282 MD5 ff55be8ebf757b97d823bb3cf08b8bc4 files/GNUstep-reset.sh.patch 2121 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030-r1 0 -MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0 71 MD5 020f6b825d80a9769c36a39877f13f44 files/digest-gnustep-make-1.10.0-r1 71 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041030 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041116 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-make-1.10.1_pre20041203 0 diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0 deleted file mode 100644 index a6f51a10dfba..000000000000 --- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 bfd0f6530b938e7ee1d5a300219a0ab3 gnustep-make-1.10.0.tar.gz 372852 diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030 +++ /dev/null diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041030-r1 +++ /dev/null diff --git a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041116 b/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041116 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/gnustep-base/gnustep-make/files/digest-gnustep-make-1.10.1_pre20041116 +++ /dev/null diff --git a/gnustep-base/gnustep-make/files/helloworld.m b/gnustep-base/gnustep-make/files/helloworld.m deleted file mode 100644 index af2414df1c03..000000000000 --- a/gnustep-base/gnustep-make/files/helloworld.m +++ /dev/null @@ -1,54 +0,0 @@ -/** - * This example taken from the tutorial at: - * http://gnustep.made-it.com/GSPT/xml/Tutorial_en.html - * - <quote> - A GNUstep Programming Tutorial - Time is on our side... - Yen-Ju Chen - Dennis Leeuw - - Copyright � 2003 Yen-Ju Chen, Dennis Leeuw - - Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. - </quote> - */ - -#include <objc/Object.h> - -@interface Greeter:Object -{ - /* This is left empty on purpose: - ** Normally instance variables would be declared here, - ** but these are not used in our example. - */ -} - -- (void)greet; - -@end - -#include <stdio.h> - -@implementation Greeter - -- (void)greet -{ - printf("Hello, World!\n"); -} - -@end - -#include <stdlib.h> - -int main(void) -{ - id myGreeter; - myGreeter=[Greeter new]; - - [myGreeter greet]; - - [myGreeter free]; - return EXIT_SUCCESS; -} - diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild index 6525868368b3..67f22307c61d 100644 --- a/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild +++ b/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild,v 1.1 2004/11/12 03:46:56 fafhrd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0-r1.ebuild,v 1.2 2004/12/13 23:06:59 fafhrd Exp $ inherit gnustep @@ -8,7 +8,7 @@ DESCRIPTION="The makefile package is a simple, powerful and extensible way to wr HOMEPAGE="http://www.gnustep.org" SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" -KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha" +KEYWORDS="ppc ~x86 amd64 ~sparc ~alpha" SLOT="0" LICENSE="GPL-2" @@ -24,11 +24,10 @@ egnustep_install_domain "System" pkg_setup() { gnustep_pkg_setup - # okay, I couldn't figure out how to check if a dependency was - # compiled with a specific use flag, so we do it ./configure - # check-for-lib style ... - gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \ - "gcc must be compiled with Objective-C support! See the objc USE flag." + if [ "$(objc_available)" == "no" ]; then + objc_not_available_info + die "ObjC support not available" + fi if use layout-from-conf-file && use layout-osx-like ; then eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags." diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild deleted file mode 100644 index 45351c5eb0e0..000000000000 --- a/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.0.ebuild,v 1.5 2004/11/12 03:46:56 fafhrd Exp $ - -inherit gnustep - -DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project." - -HOMEPAGE="http://www.gnustep.org" -SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz" -KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha" -SLOT="0" -LICENSE="GPL-2" - -IUSE="${IUSE} doc" -DEPEND="${GNUSTEP_CORE_DEPEND} - >=sys-devel/make-3.75 - ${DOC_DEPEND}" -RDEPEND="${DEPEND} - ${DOC_RDEPEND}" - -pkg_setup() { - gnustep_pkg_setup - - # okay, I couldn't figure out how to check if a dependency was - # compiled with a specific use flag, so we do it ./configure - # check-for-lib style ... - gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \ - "gcc must be compiled with Objective-C support! See the objc USE flag." -} - -src_unpack() { - unpack ${A} - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-${PV} -} - -src_compile() { - cd ${S} - - myconf="--prefix=${GENTOO_GNUSTEP_ROOT}" - myconf="$myconf --with-network-root=${GENTOO_GNUSTEP_ROOT}/Network" - myconf="$myconf --with-tar=/bin/tar" - econf $myconf || die "configure failed" - - egnustep_make -} - -src_install() { - . ${S}/GNUstep.sh - - if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then - if use debug ; then - emake -j1 INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \ - GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ - debug=yes install || die "install has failed" - else - emake -j1 INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \ - GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ - install || die "install has failed" - fi - else - die "no Makefile found" - fi - - . ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles/GNUstep.sh - - if use doc ; then - cd Documentation - make INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \ - GNUSTEP_USER_ROOT=${TMP}/GNUstep \ - GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \ - all || die "doc build failed" - make INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \ - GNUSTEP_USER_ROOT=${TMP}/GNUstep \ - GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \ - install || die "doc install failed" - cd .. - fi -} - diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild deleted file mode 100644 index c36617c56480..000000000000 --- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030-r1.ebuild,v 1.2 2004/11/23 20:33:32 eradicator Exp $ - -ECVS_CVS_COMMAND="cvs -q" -ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep" -ECVS_USER="anoncvs" -ECVS_AUTH="ext" -ECVS_MODULE="gnustep/core/make" -ECVS_CO_OPTS="-P -D ${PV/*_pre}" -ECVS_UP_OPTS="-dP -D ${PV/*_pre}" -ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep" -inherit gnustep cvs - -S=${WORKDIR}/${ECVS_MODULE} - -DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project." -HOMEPAGE="http://www.gnustep.org" - -KEYWORDS="~x86 ~ppc amd64 ~sparc ~alpha" -SLOT="0" -LICENSE="GPL-2" - -IUSE="${IUSE} doc layout-from-conf-file layout-osx-like non-flattened" -DEPEND="${GNUSTEP_CORE_DEPEND} - >=sys-devel/make-3.75 - ${DOC_DEPEND}" -RDEPEND="${DEPEND} - ${DOC_RDEPEND}" - -egnustep_install_domain "System" - -pkg_setup() { - gnustep_pkg_setup - - # okay, I couldn't figure out how to check if a dependency was - # compiled with a specific use flag, so we do it ./configure - # check-for-lib style ... - gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \ - "gcc must be compiled with Objective-C support! See the objc USE flag." - - if use layout-from-conf-file && use layout-osx-like ; then - eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags." - die "USE flag misconfiguration -- please correct" - fi - - if use layout-from-conf-file || use layout-osx-like ; then - ewarn "USE layout-from-conf-file || layout-osx-like" - ewarn "Utilizing these USE flags allows one to install files in non standard" - ewarn " locations vis a vis the Linux FHS -- please fully comprehend what you" - ewarn " are doing when setting this USE flag." - fi - - if use layout-from-conf-file; then - if [ ! -f /etc/conf.d/gnustep.env ]; then - eerror "There is no /etc/conf.d/gnustep.env file!" - eerror "Did you read the USE flag description?" - die "USE flag misconfiguration -- please correct" - else - unset GNUSTEP_SYSTEM_ROOT - unset GNUSTEP_LOCAL_ROOT - unset GNUSTEP_NETWORK_ROOT - unset GNUSTEP_USER_ROOT - . /etc/conf.d/gnustep.env - if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then - eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}" - die "USE flag misconfiguration -- please correct" - fi - if [ "/System" != ${GNUSTEP_SYSTEM_ROOT:$((${#GNUSTEP_SYSTEM_ROOT}-7)):7} ]; then - eerror "GNUSTEP_SYSTEM_ROOT must end with \"System\" -- read the USE flag directions!!!" - die "USE flag misconfiguration -- please correct" - fi - if [ "${GNUSTEP_LOCAL_ROOT}" ] && [ "/" != "${GNUSTEP_LOCAL_ROOT:0:1}" ]; then - eerror "GNUSTEP_LOCAL_ROOT is misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}" - die "USE flag misconfiguration -- please correct" - elif [ -z "${GNUSTEP_LOCAL_ROOT}" ]; then - GNUSTEP_LOCAL_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Local" - fi - if [ "${GNUSTEP_NETWORK_ROOT}" ] && [ "/" != "${GNUSTEP_NETWORK_ROOT:0:1}" ]; then - eerror "GNUSTEP_NETWORK_ROOT is misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}" - die "USE flag misconfiguration -- please correct" - elif [ -z "${GNUSTEP_NETWORK_ROOT}" ]; then - GNUSTEP_NETWORK_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Network" - fi - if [ "${GNUSTEP_USER_ROOT}" ] && [ '~' != "${GNUSTEP_USER_ROOT:0:1}" ]; then - eerror "GNUSTEP_USER_ROOT is misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT}" - die "USE flag misconfiguration -- please correct" - elif [ -z "${GNUSTEP_USER_ROOT}" ]; then - GNUSTEP_USER_ROOT='~/GNUstep' - fi - - egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})" - egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}" - egnustep_local_root "${GNUSTEP_LOCAL_ROOT}" - egnustep_network_root "${GNUSTEP_NETWORK_ROOT}" - egnustep_user_root "${GNUSTEP_USER_ROOT}" - fi - elif use layout-osx-like; then - egnustep_prefix "/" - egnustep_system_root "/System" - egnustep_local_root "/" - egnustep_network_root "/Network" - egnustep_user_root '~' - else - # setup defaults here - egnustep_prefix "/usr/GNUstep" - egnustep_system_root "/usr/GNUstep/System" - egnustep_local_root "/usr/GNUstep/Local" - egnustep_network_root "/usr/GNUstep/Network" - egnustep_user_root '~/GNUstep' - fi - - einfo "GNUstep installation will be laid out thusly:" - einfo "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`" - einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`" - einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`" - einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`" - ebeep - epause 10 -} - -src_unpack() { - cvs_src_unpack - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0 - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch -} - -src_compile() { - cd ${S} - - # gnustep-make ./configure : "prefix" here is going to be where - # "System" is installed -- other correct paths should be set - # by econf - local myconf - myconf="--prefix=`egnustep_prefix`" - use non-flattened && myconf="$myconf --disable-flattened" - myconf="$myconf --with-tar=/bin/tar" - myconf="$myconf --with-local-root=`egnustep_local_root`" - myconf="$myconf --with-network-root=`egnustep_network_root`" - myconf="$myconf --with-user-root=`egnustep_user_root`" - econf $myconf || die "configure failed" - - egnustep_make -} - -src_install() { - . ${S}/GNUstep.sh - - if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then - local make_eval="INSTALL_ROOT=\${D} \ - GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \ - GNUSTEP_NETWORK_ROOT=\${D}\$(egnustep_network_root) \ - GNUSTEP_LOCAL_ROOT=\${D}\$(egnustep_local_root) \ - GNUSTEP_MAKEFILES=\${D}\$(egnustep_system_root)/Library/Makefiles \ - GNUSTEP_USER_ROOT=\${TMP} \ - GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \ - -j1" - - if use debug ; then - make_eval="${make_eval} debug=yes" - fi - if use verbose ; then - make_eval="${make_eval} verbose=yes" - fi - eval emake ${make_eval} install || die "install has failed" - else - die "no Makefile found" - fi - - if use doc ; then - cd Documentation - eval emake ${make_eval} all || die "doc make has failed" - eval emake ${make_eval} install || die "doc install has failed" - cd .. - fi - - dodir /etc/conf.d - echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env - echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env - echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env - echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env -} - diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild deleted file mode 100644 index 99f53028413b..000000000000 --- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041030.ebuild,v 1.3 2004/11/12 03:46:56 fafhrd Exp $ - -ECVS_CVS_COMMAND="cvs -q" -ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep" -ECVS_USER="anoncvs" -ECVS_AUTH="ext" -ECVS_MODULE="gnustep/core/make" -ECVS_CO_OPTS="-P -D ${PV/*_pre}" -ECVS_UP_OPTS="-dP -D ${PV/*_pre}" -ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep" -inherit gnustep cvs - -S=${WORKDIR}/${ECVS_MODULE} - -DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project." -HOMEPAGE="http://www.gnustep.org" - -KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha" -SLOT="0" -LICENSE="GPL-2" - -IUSE="${IUSE} doc" -DEPEND="${GNUSTEP_CORE_DEPEND} - >=sys-devel/make-3.75 - ${DOC_DEPEND}" -RDEPEND="${DEPEND} - ${DOC_RDEPEND}" - -pkg_setup() { - gnustep_pkg_setup - - # okay, I couldn't figure out how to check if a dependency was - # compiled with a specific use flag, so we do it ./configure - # check-for-lib style ... - gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \ - "gcc must be compiled with Objective-C support! See the objc USE flag." -} - -src_unpack() { - cvs_src_unpack - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0 -} - -src_compile() { - cd ${S} - - myconf="--prefix=${GENTOO_GNUSTEP_ROOT}" - myconf="$myconf --with-network-root=${GENTOO_GNUSTEP_ROOT}/Network" - myconf="$myconf --with-tar=/bin/tar" - econf $myconf || die "configure failed" - - egnustep_make -} - -src_install() { - . ${S}/GNUstep.sh - - if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then - if use debug ; then - emake -j1 INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \ - GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ - debug=yes install || die "install has failed" - else - emake -j1 INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \ - GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ - install || die "install has failed" - fi - else - die "no Makefile found" - fi - - . ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles/GNUstep.sh - - if use doc ; then - cd Documentation - make INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \ - GNUSTEP_USER_ROOT=${TMP}/GNUstep \ - GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \ - all || die "doc build failed" - make INSTALL_ROOT=${D} \ - GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \ - GNUSTEP_MAKEFILES=${D}${GENTOO_GNUSTEP_ROOT}/System/Library/Makefiles \ - GNUSTEP_USER_ROOT=${TMP}/GNUstep \ - GNUSTEP_DEFAULTS_ROOT=${TMP}/GNUstep \ - install || die "doc install failed" - cd .. - fi -} - diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041116.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041116.ebuild deleted file mode 100644 index 5132ba0bdfd4..000000000000 --- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041116.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041116.ebuild,v 1.1 2004/11/16 23:13:42 fafhrd Exp $ - -ECVS_CVS_COMMAND="cvs -q" -ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep" -ECVS_USER="anoncvs" -ECVS_AUTH="ext" -ECVS_MODULE="gnustep/core/make" -ECVS_CO_OPTS="-P -D ${PV/*_pre}" -ECVS_UP_OPTS="-dP -D ${PV/*_pre}" -ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep" -inherit gnustep cvs - -S=${WORKDIR}/${ECVS_MODULE} - -DESCRIPTION="The makefile package is a simple, powerful and extensible way to write makefiles for a GNUstep-based project." -HOMEPAGE="http://www.gnustep.org" - -KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha" -SLOT="0" -LICENSE="GPL-2" - -IUSE="${IUSE} doc layout-from-conf-file layout-osx-like non-flattened" -DEPEND="${GNUSTEP_CORE_DEPEND} - >=sys-devel/make-3.75 - ${DOC_DEPEND}" -RDEPEND="${DEPEND} - ${DOC_RDEPEND}" - -egnustep_install_domain "System" - -pkg_setup() { - gnustep_pkg_setup - - # okay, I couldn't figure out how to check if a dependency was - # compiled with a specific use flag, so we do it ./configure - # check-for-lib style ... - gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \ - "gcc must be compiled with Objective-C support! See the objc USE flag." - - if use layout-from-conf-file && use layout-osx-like ; then - eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags." - die "USE flag misconfiguration -- please correct" - fi - - if use layout-from-conf-file || use layout-osx-like ; then - ewarn "USE layout-from-conf-file || layout-osx-like" - ewarn "Utilizing these USE flags allows one to install files in non standard" - ewarn " locations vis a vis the Linux FHS -- please fully comprehend what you" - ewarn " are doing when setting this USE flag." - fi - - if use layout-from-conf-file; then - if [ ! -f /etc/conf.d/gnustep.env ]; then - eerror "There is no /etc/conf.d/gnustep.env file!" - eerror "Did you read the USE flag description?" - die "USE flag misconfiguration -- please correct" - else - unset GNUSTEP_SYSTEM_ROOT - unset GNUSTEP_LOCAL_ROOT - unset GNUSTEP_NETWORK_ROOT - unset GNUSTEP_USER_ROOT - . /etc/conf.d/gnustep.env - if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then - eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT}" - die "USE flag misconfiguration -- please correct" - fi - if [ "/System" != ${GNUSTEP_SYSTEM_ROOT:$((${#GNUSTEP_SYSTEM_ROOT}-7)):7} ]; then - eerror "GNUSTEP_SYSTEM_ROOT must end with \"System\" -- read the USE flag directions!!!" - die "USE flag misconfiguration -- please correct" - fi - if [ "${GNUSTEP_LOCAL_ROOT}" ] && [ "/" != "${GNUSTEP_LOCAL_ROOT:0:1}" ]; then - eerror "GNUSTEP_LOCAL_ROOT is misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT}" - die "USE flag misconfiguration -- please correct" - elif [ -z "${GNUSTEP_LOCAL_ROOT}" ]; then - GNUSTEP_LOCAL_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Local" - fi - if [ "${GNUSTEP_NETWORK_ROOT}" ] && [ "/" != "${GNUSTEP_NETWORK_ROOT:0:1}" ]; then - eerror "GNUSTEP_NETWORK_ROOT is misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}" - die "USE flag misconfiguration -- please correct" - elif [ -z "${GNUSTEP_NETWORK_ROOT}" ]; then - GNUSTEP_NETWORK_ROOT="$(dirname ${GNUSTEP_SYSTEM_ROOT})/Network" - fi - if [ "${GNUSTEP_USER_ROOT}" ] && [ '~' != "${GNUSTEP_USER_ROOT:0:1}" ]; then - eerror "GNUSTEP_USER_ROOT is misconfigured in /etc/conf.d/gnustep.env" - eerror "GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT}" - die "USE flag misconfiguration -- please correct" - elif [ -z "${GNUSTEP_USER_ROOT}" ]; then - GNUSTEP_USER_ROOT='~/GNUstep' - fi - - egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})" - egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}" - egnustep_local_root "${GNUSTEP_LOCAL_ROOT}" - egnustep_network_root "${GNUSTEP_NETWORK_ROOT}" - egnustep_user_root "${GNUSTEP_USER_ROOT}" - fi - elif use layout-osx-like; then - egnustep_prefix "/" - egnustep_system_root "/System" - egnustep_local_root "/" - egnustep_network_root "/Network" - egnustep_user_root '~' - else - # setup defaults here - egnustep_prefix "/usr/GNUstep" - egnustep_system_root "/usr/GNUstep/System" - egnustep_local_root "/usr/GNUstep/Local" - egnustep_network_root "/usr/GNUstep/Network" - egnustep_user_root '~/GNUstep' - fi - - einfo "GNUstep installation will be laid out thusly:" - einfo "\tGNUSTEP_SYSTEM_ROOT=`egnustep_system_root`" - einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`" - einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`" - einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`" - ebeep - epause 10 -} - -src_unpack() { - cvs_src_unpack - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/make-user-defaults.patch-1.10.0 - EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/GNUstep-reset.sh.patch -} - -src_compile() { - cd ${S} - - # gnustep-make ./configure : "prefix" here is going to be where - # "System" is installed -- other correct paths should be set - # by econf - local myconf - myconf="--prefix=`egnustep_prefix`" - use non-flattened && myconf="$myconf --disable-flattened" - myconf="$myconf --with-tar=/bin/tar" - myconf="$myconf --with-local-root=`egnustep_local_root`" - myconf="$myconf --with-network-root=`egnustep_network_root`" - myconf="$myconf --with-user-root=`egnustep_user_root`" - econf $myconf || die "configure failed" - - egnustep_make -} - -src_install() { - . ${S}/GNUstep.sh - - if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then - local make_eval="INSTALL_ROOT=\${D} \ - GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \ - GNUSTEP_NETWORK_ROOT=\${D}\$(egnustep_network_root) \ - GNUSTEP_LOCAL_ROOT=\${D}\$(egnustep_local_root) \ - GNUSTEP_MAKEFILES=\${D}\$(egnustep_system_root)/Library/Makefiles \ - GNUSTEP_USER_ROOT=\${TMP} \ - GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \ - -j1" - - if use debug ; then - make_eval="${make_eval} debug=yes" - fi - if use verbose ; then - make_eval="${make_eval} verbose=yes" - fi - eval emake ${make_eval} install || die "install has failed" - else - die "no Makefile found" - fi - - if use doc ; then - cd Documentation - eval emake ${make_eval} all || die "doc make has failed" - eval emake ${make_eval} install || die "doc install has failed" - cd .. - fi - - dodir /etc/conf.d - echo "GNUSTEP_SYSTEM_ROOT=$(egnustep_system_root)" > ${D}/etc/conf.d/gnustep.env - echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env - echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env - echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env -} - diff --git a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild index 870af8aa6695..e4f3b8b1b9b1 100644 --- a/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild +++ b/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild,v 1.2 2004/12/05 21:36:57 fafhrd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-1.10.1_pre20041203.ebuild,v 1.3 2004/12/13 23:06:59 fafhrd Exp $ ECVS_CVS_COMMAND="cvs -q" ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep" @@ -33,11 +33,10 @@ egnustep_install_domain "System" pkg_setup() { gnustep_pkg_setup - # okay, I couldn't figure out how to check if a dependency was - # compiled with a specific use flag, so we do it ./configure - # check-for-lib style ... - gcc ${FILESDIR}/helloworld.m -o $TMP/helloworld -lobjc || die \ - "gcc must be compiled with Objective-C support! See the objc USE flag. NOTE: if you have to recompile gcc anyway, now may be the time to also add the 'gcj' use flag, so that libffi will also be compiled. Any gcc-3 version with 'gcj' should work, however, if you are testing >=gcc-3.4.3-r1 'objc' USE flag on should also install libffi." + if [ "$(objc_available)" == "no" ]; then + objc_not_available_info + die "ObjC support not available" + fi if use layout-from-conf-file && use layout-osx-like ; then eerror "layout-from-conf-file and layout-osx-like are mutually exclusive use flags." |