summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2009-04-13 01:27:04 +0000
committerroot <root@miranda.amd64.dev.gentoo.org>2009-04-13 01:27:04 +0000
commit701643baf03ee71e6566ed328c468432cb71da56 (patch)
tree983e82708d84d27b9a8a2e86571fd7ad194ccd64
parent[gpe-xsession/xserver-common] Update description and add DEPEND. (diff)
downloadgpe-701643baf03ee71e6566ed328c468432cb71da56.tar.gz
gpe-701643baf03ee71e6566ed328c468432cb71da56.tar.bz2
gpe-701643baf03ee71e6566ed328c468432cb71da56.zip
[gpe-base/gpe-conf] backport shutdown routine from svn. override GPECONF to keep econf quiet about debug or nls.
-rw-r--r--gpe-base/gpe-conf/Manifest3
-rw-r--r--gpe-base/gpe-conf/files/svn-shutdown.patch12
-rw-r--r--gpe-base/gpe-conf/gpe-conf-0.2.8.ebuild6
3 files changed, 19 insertions, 2 deletions
diff --git a/gpe-base/gpe-conf/Manifest b/gpe-base/gpe-conf/Manifest
index 6573866..7daf4be 100644
--- a/gpe-base/gpe-conf/Manifest
+++ b/gpe-base/gpe-conf/Manifest
@@ -1,5 +1,6 @@
+AUX svn-shutdown.patch 437 SHA1 90196575004176d5fcc8c70fdc1eb5695c8762b2 SHA256 c4e8b5417b58ed2890fa4252cba7c55322d388123314d21bda1a829f5e739fbf
DIST gpe-conf-0.2.6.tar.bz2 539861 SHA1 d6164ae03b020d8a6da7924412b635dd02d4c305 SHA256 0d46c8ec7b443d37630ef0625df3ac824f590a3048c6b973be83c305ab4de079
DIST gpe-conf-0.2.8.tar.bz2 584829 SHA1 d6db237735a3710f934d7cce627c0a8d4e0f4ea1 SHA256 0f8c72783b2faf51c3f1a71dfedc0eab26097d7bf8924ebee7615bfce5725491
EBUILD gpe-conf-0.2.6.ebuild 789 SHA1 e1ee79f2cad3c0c9e2c4d60e69ea41473f03c6d9 SHA256 6374f4e051b4fa074b8cb6cdd16d018ae81e31154980b86b66327a2e6e4ecd6f
-EBUILD gpe-conf-0.2.8.ebuild 789 SHA1 e1ee79f2cad3c0c9e2c4d60e69ea41473f03c6d9 SHA256 6374f4e051b4fa074b8cb6cdd16d018ae81e31154980b86b66327a2e6e4ecd6f
+EBUILD gpe-conf-0.2.8.ebuild 878 SHA1 220532e8601960cbe22bf269b4cdcacc87ac6914 SHA256 ac0fb0c5cd747c84bf34cf555a6df4a804794cad41402bb3fb9e809f600516a8
MISC metadata.xml 331 SHA1 cf1aee9ccf6a4022c8bbcdd809ffdd6a7798c158 SHA256 6cb98af17600d30d8dc3b83bbcfc79463464db3c45158f20b3168ad9e64e12bf
diff --git a/gpe-base/gpe-conf/files/svn-shutdown.patch b/gpe-base/gpe-conf/files/svn-shutdown.patch
new file mode 100644
index 0000000..b673ebe
--- /dev/null
+++ b/gpe-base/gpe-conf/files/svn-shutdown.patch
@@ -0,0 +1,12 @@
+diff -u suid.c.orig suid.c
+--- suid.c.orig 2008-06-05 10:41:26.000000000 +0000
++++ suid.c 2009-03-11 04:00:24.000000000 +0000
+@@ -454,7 +454,7 @@ suidloop (int write, int read)
+ else if (strcmp (cmd, "SHDN") == 0) // shutdown device
+ {
+ fscanf (in, "%100s", arg2);
+- system ("/sbin/poweroff");
++ system ("/sbin/shutdown -h now");
+ }
+ else if (strcmp (cmd, "MODP") == 0) /* modprobe kernel module */
+ {
diff --git a/gpe-base/gpe-conf/gpe-conf-0.2.8.ebuild b/gpe-base/gpe-conf/gpe-conf-0.2.8.ebuild
index 8ed32a9..29c669c 100644
--- a/gpe-base/gpe-conf/gpe-conf-0.2.8.ebuild
+++ b/gpe-base/gpe-conf/gpe-conf-0.2.8.ebuild
@@ -3,7 +3,7 @@
# $Header: $
GPE_TARBALL_SUFFIX="bz2"
-inherit gpe autotools flag-o-matic
+inherit gpe autotools flag-o-matic eutils
DESCRIPTION="${PN} for the GPE Palmtop Environment"
IUSE="${IUSE}"
@@ -17,9 +17,13 @@ RDEPEND="${RDEPEND}
gpe-xsession/xst
gpe-base/libgpewidget"
+GPECONF=""
src_unpack() {
gpe_src_unpack
+ epatch "${FILESDIR}"/svn-shutdown.patch
+
+ # this sed is fixed in svn.
sed -i -e s/libxsettings-client// configure.ac || die "no cookie for you"
# Configure doesnt substitute this one