summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnustep-base/gnustep-make/Manifest7
-rw-r--r--gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch21
-rw-r--r--gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild8
3 files changed, 32 insertions, 4 deletions
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 721c934..67dcc99 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,4 +1,5 @@
-AUX gnustep-2.csh 294 RMD160 79a042d3a96917afb41522d8f33ba0507e788245 SHA1 6b9d34c9110a4db82692ebc5618eed7d4c11f531 SHA256 78647a75084d1a7361e1af2ec9fe2361d9d8561c16b950015e64ddb5218f1986
-AUX gnustep-2.sh 290 RMD160 1c40f82315a10cd85fe36df627538d684a952cb4 SHA1 4fe1eddb9a6b54d48255c3171c378218deb76cd8 SHA256 65d6587a9796b9686a5b7e8e54e4975635ad076aeb901e70eee77c3aa9e524ed
+AUX gnustep-2.csh 356 RMD160 f667bff3d56a5fe3759926164390017ae1fb221a SHA1 2a3f3490deea7c7e84defe71c8505e47f24983e8 SHA256 430e5bb7281db8abf0641d9a16d14b993642fc33a24736166b8df68c9bbf6643
+AUX gnustep-2.sh 360 RMD160 31e495c76dad65fd605c4b0275d384cd6b1d0cd9 SHA1 9d35754dd5590cbbd872c020f490717b404a1268 SHA256 960a8934f82aec4337279c75be844823897a21237aedbb3e4144e3e28d13d611
+AUX gnustep-make-2.0.1-destdir.patch 975 RMD160 c2647803d412c954b546e4352310705aac805159 SHA1 94ea603da99cc6b973ecfbd7e3c3980f53c5da0a SHA256 68e386ad5dfeb90138723081ce0d45fd6c426dbcf9660784eb85707dee7be474
DIST gnustep-make-2.0.1.tar.gz 444343 RMD160 b70f2cfbca02898018403787cd5ab879a0beafd8 SHA1 5b9722a364e6b839542fd7ccc6acf7ed4e5cbf6f SHA256 63d5f1bc8f2f12707f0c109ddff3492a297e4ae21ff13eee62ed4e2aa761f653
-EBUILD gnustep-make-2.0.1.ebuild 1831 RMD160 9fa7489c9cd5c0a9ce26db9dc032138575f2ee38 SHA1 455381fbfca4644a47bd7afc736d3e571168bca4 SHA256 9480b6d9739676a450de3ad94e471ec177e166fb11a76fa6f4d2b3150fca7798
+EBUILD gnustep-make-2.0.1.ebuild 2195 RMD160 8998ec85a7d0d92af03020af64ba40bef8aa33a5 SHA1 f534c0b860c7a590f44ca9bdc0b28635c47933c2 SHA256 22320875fe5b99c00efd92e24df6a25a4c59d9f52e92875ff8c485eda99fc7e2
diff --git a/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch b/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch
new file mode 100644
index 0000000..407a514
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-make-2.0.1-destdir.patch
@@ -0,0 +1,21 @@
+* grobian@gentoo.org: because we use sandbox this check fails (cannot
+ write outside the DESTDIR. Allowing to write in the
+ GNUSTEP_INSTALLATION_DIR means our sandbox is useless, since then
+ everything can be written, so prefer to just check the DESTDIR
+ location instead.
+
+--- Master/rules.make
++++ Master/rules.make
+@@ -107,9 +107,9 @@
+
+ ifneq ($(GNUSTEP_INSTALLATION_DIR),)
+ internal-check-install-permissions:
+- @if [ -d "$(GNUSTEP_INSTALLATION_DIR)" \
+- -a ! -w "$(GNUSTEP_INSTALLATION_DIR)" ]; then \
+- echo "*ERROR*: the software is configured to install itself into $(GNUSTEP_INSTALLATION_DIR)"; \
++ @if [ -d "$(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)" \
++ -a ! -w "$(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)" ]; then \
++ echo "*ERROR*: the software is configured to install itself into $(DESTDIR)$(GNUSTEP_INSTALLATION_DIR)"; \
+ echo "but you do not have permissions to write in that directory:";\
+ echo "Aborting installation."; \
+ echo ""; \
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild
index 9cf7295..0ce31cf 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.0.1.ebuild
@@ -4,7 +4,7 @@
EAPI="prefix"
-inherit gnustep-base
+inherit gnustep-base eutils
DESCRIPTION="GNUstep Makefile Package"
@@ -27,6 +27,12 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-destdir.patch
+}
+
src_compile() {
cd ${S}