From cd7f1176d77706b4346479eebc55b9ce03b7f3c5 Mon Sep 17 00:00:00 2001 From: Angelo Arrifano Date: Sat, 30 May 2009 14:39:22 +0000 Subject: [gpe-xsession/gpe-dm] Move into gpe-base. gpe-xsession is too small, we will deprecate this cat in the future. --- gpe-base/gpe-dm/Manifest | 6 ++++ gpe-base/gpe-dm/files/Xinit | 16 +++++++++ gpe-base/gpe-dm/files/Xserver | 41 +++++++++++++++++++++ gpe-base/gpe-dm/files/gpe-dm-noinitd.patch | 24 +++++++++++++ gpe-base/gpe-dm/gpe-dm-0.51-r1.ebuild | 49 ++++++++++++++++++++++++++ gpe-base/gpe-dm/gpe-dm-0.51.ebuild | 18 ++++++++++ gpe-xsession/gpe-dm/Manifest | 6 ---- gpe-xsession/gpe-dm/files/Xinit | 16 --------- gpe-xsession/gpe-dm/files/Xserver | 41 --------------------- gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch | 24 ------------- gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild | 49 -------------------------- gpe-xsession/gpe-dm/gpe-dm-0.51.ebuild | 18 ---------- 12 files changed, 154 insertions(+), 154 deletions(-) create mode 100644 gpe-base/gpe-dm/Manifest create mode 100644 gpe-base/gpe-dm/files/Xinit create mode 100644 gpe-base/gpe-dm/files/Xserver create mode 100644 gpe-base/gpe-dm/files/gpe-dm-noinitd.patch create mode 100644 gpe-base/gpe-dm/gpe-dm-0.51-r1.ebuild create mode 100644 gpe-base/gpe-dm/gpe-dm-0.51.ebuild delete mode 100644 gpe-xsession/gpe-dm/Manifest delete mode 100644 gpe-xsession/gpe-dm/files/Xinit delete mode 100644 gpe-xsession/gpe-dm/files/Xserver delete mode 100644 gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch delete mode 100644 gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild delete mode 100644 gpe-xsession/gpe-dm/gpe-dm-0.51.ebuild diff --git a/gpe-base/gpe-dm/Manifest b/gpe-base/gpe-dm/Manifest new file mode 100644 index 0000000..5e61477 --- /dev/null +++ b/gpe-base/gpe-dm/Manifest @@ -0,0 +1,6 @@ +AUX Xinit 558 SHA1 0271e04a92a16b770c6d809511dad0274dc85936 SHA256 d4f321db0e60a94363e032b6aa3c272c4dfadf5f96f70fa7a8602f4d01e86917 +AUX Xserver 1577 SHA1 95a3408dfa9f14388262d7496404fac838365dab SHA256 4312cc532bcede6c8d7909341511430089cba62203d5fd7271490e366693a8d7 +AUX gpe-dm-noinitd.patch 574 SHA1 e761a112821782b90ea856c3ce93a7dadfe93b22 SHA256 60b648538c93808e977ad7a7c73118691402877a38e2c189e53502cc301da1a7 +DIST gpe-dm-0.51.tar.bz2 110734 SHA1 53c667da7129609582e8031f37c33c8441d5f4f1 SHA256 4f7546bc5f8df7eb9511b919e34eb08945db4359fd3db07c555b83959923a1cf +EBUILD gpe-dm-0.51-r1.ebuild 1093 SHA1 6744833e857398b39c457c4b9ad5928d564b0ab6 SHA256 db7d012a3ea4e43f2d2d5366fdc46d9e0fff6d09063812008a9d9b9510bcce83 +EBUILD gpe-dm-0.51.ebuild 344 SHA1 617971569ac3f9d9f52acb2fc38b0724d96eb7bc SHA256 3a0c4bd53c3e2b6294b23c8e8268ba9ac7c5ca8a53e8a09f89cd209998dd97f8 diff --git a/gpe-base/gpe-dm/files/Xinit b/gpe-base/gpe-dm/files/Xinit new file mode 100644 index 0000000..5b8c969 --- /dev/null +++ b/gpe-base/gpe-dm/files/Xinit @@ -0,0 +1,16 @@ +#!/bin/sh +# Copied from gpe xserver-common + +export USER=root +export HOME=/home/root +if [ ! -d $HOME ] && [ -d /root ]; then + HOME=/root +fi +export XAPPLRESDIR=/usr/X11R6/lib/app-defaults +export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad + +export PATH=$PATH:/usr/X11R6/bin + +SYSSESSIONDIR=/etc/X11/gpe-dm/Xinit.d + +exec run-parts $SYSSESSIONDIR diff --git a/gpe-base/gpe-dm/files/Xserver b/gpe-base/gpe-dm/files/Xserver new file mode 100644 index 0000000..f90721f --- /dev/null +++ b/gpe-base/gpe-dm/files/Xserver @@ -0,0 +1,41 @@ +#!/bin/sh +# /etc/X11/gpe-dm/Xserver: The Xserver startup script of gpe-dm. +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Angelo Arrifano +# $Header: $ + +############################################################################ +# NOTE: If you are using Xorg, you should edit /etc/X11/xorg.conf instead. # +############################################################################ + +# The input devices available on your device. +# INPUT_DEVICES="${INPUT_DEVICES} -mouse tslib,,device=/dev/input/ts" +# INPUT_DEVICES="${INPUT_DEVICES} -keybd keyboard,,device=/dev/input/keypad" +# INPUT_DEVICES="${INPUT_DEVICES} -keybd keyboard,,device=/dev/input/dpad" +INPUT_DEVICES="${INPUT_DEVICES} -mouse tslib,,device=/dev/input/ts" +INPUT_DEVICES="${INPUT_DEVICES} -keybd keyboard,,device=/dev/input/keypad" + +# Your screen resolution, it should work even if you don't set it. +# SCREEN_GEOMETRY="-screen 320x240" # QVGA +# SCREEN_GEOMETRY="-screen 640x480" # VGA +SCREEN_GEOMETRY="" + +# The screen DPI +# SCREEN_DPI="-dpi 100" +SCREEN_DPI="" + +# The framebuffer device, set if your device name is non startard +# our would like to use another device. +# FB_DEVICE="-fb /dev/fb1" +FB_DEVICE="" + +# Additional Xserver parameters. +EXTRA_ARGS="-br -pn" + +# Choose the Xserver to start. +# Rule of the thumb: Xfbdev for embedded and Xorg for desktops. +# exec Xfbdev ${SCREEN_GEOMETRY} ${SCREEN_DPI} ${FB_DEVICE} ${INPUT_DEVICES} ${EXTRA_ARGS} +# exec Xorg :0 -audit 0 -nolisten tcp vt7 +exec Xorg :0 -audit 0 -nolisten tcp vt7 + diff --git a/gpe-base/gpe-dm/files/gpe-dm-noinitd.patch b/gpe-base/gpe-dm/files/gpe-dm-noinitd.patch new file mode 100644 index 0000000..237f36c --- /dev/null +++ b/gpe-base/gpe-dm/files/gpe-dm-noinitd.patch @@ -0,0 +1,24 @@ +--- Makefile.am.old 2009-05-04 23:00:46.000000000 +0000 ++++ Makefile.am 2009-05-04 23:01:10.000000000 +0000 +@@ -11,11 +11,7 @@ + + gpe_dm_SOURCES = gpe-dm.c + +-initdir = $(sysconfdir)/init.d +-init_SCRIPTS = gpe-dm.init +- + EXTRA_DIST = \ +- $(init_SCRIPTS) \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in +@@ -25,9 +21,6 @@ + intltool-merge \ + intltool-update + +-install-data-hook: +- cd $(DESTDIR)$(sysconfdir)/init.d && mv gpe-dm.init gpe-dm +- + clean-local: + rm -f *.d *~ + diff --git a/gpe-base/gpe-dm/gpe-dm-0.51-r1.ebuild b/gpe-base/gpe-dm/gpe-dm-0.51-r1.ebuild new file mode 100644 index 0000000..c177b11 --- /dev/null +++ b/gpe-base/gpe-dm/gpe-dm-0.51-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +GPE_TARBALL_SUFFIX="bz2" +inherit eutils gpe autotools + +DESCRIPTION="GPE Desktop Manager" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="" + +DEPEND="${DEPEND}" +RDEPEND="${RDEPEND} + ${DEPEND} + x11-apps/xinit" + +src_unpack() { + gpe_src_unpack "$@" + + # The default path is ugly and might confuse people with + # /etc/X11/xinit + sed -i -e 's;/etc/X11;/etc/X11/gpe-dm;' gpe-dm.c \ + || die "Failed to sed file gpe-dm.c" + + # Dont use /etc/init.d/gpe-dm, use + # /etc/init.d/xdm instead + epatch "${FILESDIR}/${PN}-noinitd.patch" + eautoreconf +} + +src_install() { + gpe_src_install "$@" + + dodir /etc/X11/gpe-dm/Xinit.d + exeinto /etc/X11/gpe-dm + doexe "${FILESDIR}/Xinit" + doexe "${FILESDIR}/Xserver" +} + +pkg_postinst() { + einfo "You *really* should edit /etc/X11/gpe-dm/Xserver now to set the" + einfo "Xserver parameters (resolution, mouse, kb, ..)." + einfo "If you need some X services to be started upon X initialization," + einfo "add them to /etc/X11/gpe-dm/Xinit.d/ ." +} + diff --git a/gpe-base/gpe-dm/gpe-dm-0.51.ebuild b/gpe-base/gpe-dm/gpe-dm-0.51.ebuild new file mode 100644 index 0000000..de5f3eb --- /dev/null +++ b/gpe-base/gpe-dm/gpe-dm-0.51.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +GPE_TARBALL_SUFFIX="bz2" +inherit eutils gpe + +DESCRIPTION="GPE Desktop Manager" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~arm ~amd64 ~x86" +IUSE="" + +RDEPEND="${RDEPEND} + gpe-xsession/xserver-common" +DEPEND="${DEPEND} + ${RDEPEND}" diff --git a/gpe-xsession/gpe-dm/Manifest b/gpe-xsession/gpe-dm/Manifest deleted file mode 100644 index 5e61477..0000000 --- a/gpe-xsession/gpe-dm/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX Xinit 558 SHA1 0271e04a92a16b770c6d809511dad0274dc85936 SHA256 d4f321db0e60a94363e032b6aa3c272c4dfadf5f96f70fa7a8602f4d01e86917 -AUX Xserver 1577 SHA1 95a3408dfa9f14388262d7496404fac838365dab SHA256 4312cc532bcede6c8d7909341511430089cba62203d5fd7271490e366693a8d7 -AUX gpe-dm-noinitd.patch 574 SHA1 e761a112821782b90ea856c3ce93a7dadfe93b22 SHA256 60b648538c93808e977ad7a7c73118691402877a38e2c189e53502cc301da1a7 -DIST gpe-dm-0.51.tar.bz2 110734 SHA1 53c667da7129609582e8031f37c33c8441d5f4f1 SHA256 4f7546bc5f8df7eb9511b919e34eb08945db4359fd3db07c555b83959923a1cf -EBUILD gpe-dm-0.51-r1.ebuild 1093 SHA1 6744833e857398b39c457c4b9ad5928d564b0ab6 SHA256 db7d012a3ea4e43f2d2d5366fdc46d9e0fff6d09063812008a9d9b9510bcce83 -EBUILD gpe-dm-0.51.ebuild 344 SHA1 617971569ac3f9d9f52acb2fc38b0724d96eb7bc SHA256 3a0c4bd53c3e2b6294b23c8e8268ba9ac7c5ca8a53e8a09f89cd209998dd97f8 diff --git a/gpe-xsession/gpe-dm/files/Xinit b/gpe-xsession/gpe-dm/files/Xinit deleted file mode 100644 index 5b8c969..0000000 --- a/gpe-xsession/gpe-dm/files/Xinit +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Copied from gpe xserver-common - -export USER=root -export HOME=/home/root -if [ ! -d $HOME ] && [ -d /root ]; then - HOME=/root -fi -export XAPPLRESDIR=/usr/X11R6/lib/app-defaults -export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad - -export PATH=$PATH:/usr/X11R6/bin - -SYSSESSIONDIR=/etc/X11/gpe-dm/Xinit.d - -exec run-parts $SYSSESSIONDIR diff --git a/gpe-xsession/gpe-dm/files/Xserver b/gpe-xsession/gpe-dm/files/Xserver deleted file mode 100644 index f90721f..0000000 --- a/gpe-xsession/gpe-dm/files/Xserver +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# /etc/X11/gpe-dm/Xserver: The Xserver startup script of gpe-dm. -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# Angelo Arrifano -# $Header: $ - -############################################################################ -# NOTE: If you are using Xorg, you should edit /etc/X11/xorg.conf instead. # -############################################################################ - -# The input devices available on your device. -# INPUT_DEVICES="${INPUT_DEVICES} -mouse tslib,,device=/dev/input/ts" -# INPUT_DEVICES="${INPUT_DEVICES} -keybd keyboard,,device=/dev/input/keypad" -# INPUT_DEVICES="${INPUT_DEVICES} -keybd keyboard,,device=/dev/input/dpad" -INPUT_DEVICES="${INPUT_DEVICES} -mouse tslib,,device=/dev/input/ts" -INPUT_DEVICES="${INPUT_DEVICES} -keybd keyboard,,device=/dev/input/keypad" - -# Your screen resolution, it should work even if you don't set it. -# SCREEN_GEOMETRY="-screen 320x240" # QVGA -# SCREEN_GEOMETRY="-screen 640x480" # VGA -SCREEN_GEOMETRY="" - -# The screen DPI -# SCREEN_DPI="-dpi 100" -SCREEN_DPI="" - -# The framebuffer device, set if your device name is non startard -# our would like to use another device. -# FB_DEVICE="-fb /dev/fb1" -FB_DEVICE="" - -# Additional Xserver parameters. -EXTRA_ARGS="-br -pn" - -# Choose the Xserver to start. -# Rule of the thumb: Xfbdev for embedded and Xorg for desktops. -# exec Xfbdev ${SCREEN_GEOMETRY} ${SCREEN_DPI} ${FB_DEVICE} ${INPUT_DEVICES} ${EXTRA_ARGS} -# exec Xorg :0 -audit 0 -nolisten tcp vt7 -exec Xorg :0 -audit 0 -nolisten tcp vt7 - diff --git a/gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch b/gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch deleted file mode 100644 index 237f36c..0000000 --- a/gpe-xsession/gpe-dm/files/gpe-dm-noinitd.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.am.old 2009-05-04 23:00:46.000000000 +0000 -+++ Makefile.am 2009-05-04 23:01:10.000000000 +0000 -@@ -11,11 +11,7 @@ - - gpe_dm_SOURCES = gpe-dm.c - --initdir = $(sysconfdir)/init.d --init_SCRIPTS = gpe-dm.init -- - EXTRA_DIST = \ -- $(init_SCRIPTS) \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in -@@ -25,9 +21,6 @@ - intltool-merge \ - intltool-update - --install-data-hook: -- cd $(DESTDIR)$(sysconfdir)/init.d && mv gpe-dm.init gpe-dm -- - clean-local: - rm -f *.d *~ - diff --git a/gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild b/gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild deleted file mode 100644 index c177b11..0000000 --- a/gpe-xsession/gpe-dm/gpe-dm-0.51-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -GPE_TARBALL_SUFFIX="bz2" -inherit eutils gpe autotools - -DESCRIPTION="GPE Desktop Manager" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" -IUSE="" - -DEPEND="${DEPEND}" -RDEPEND="${RDEPEND} - ${DEPEND} - x11-apps/xinit" - -src_unpack() { - gpe_src_unpack "$@" - - # The default path is ugly and might confuse people with - # /etc/X11/xinit - sed -i -e 's;/etc/X11;/etc/X11/gpe-dm;' gpe-dm.c \ - || die "Failed to sed file gpe-dm.c" - - # Dont use /etc/init.d/gpe-dm, use - # /etc/init.d/xdm instead - epatch "${FILESDIR}/${PN}-noinitd.patch" - eautoreconf -} - -src_install() { - gpe_src_install "$@" - - dodir /etc/X11/gpe-dm/Xinit.d - exeinto /etc/X11/gpe-dm - doexe "${FILESDIR}/Xinit" - doexe "${FILESDIR}/Xserver" -} - -pkg_postinst() { - einfo "You *really* should edit /etc/X11/gpe-dm/Xserver now to set the" - einfo "Xserver parameters (resolution, mouse, kb, ..)." - einfo "If you need some X services to be started upon X initialization," - einfo "add them to /etc/X11/gpe-dm/Xinit.d/ ." -} - diff --git a/gpe-xsession/gpe-dm/gpe-dm-0.51.ebuild b/gpe-xsession/gpe-dm/gpe-dm-0.51.ebuild deleted file mode 100644 index de5f3eb..0000000 --- a/gpe-xsession/gpe-dm/gpe-dm-0.51.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -GPE_TARBALL_SUFFIX="bz2" -inherit eutils gpe - -DESCRIPTION="GPE Desktop Manager" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" -IUSE="" - -RDEPEND="${RDEPEND} - gpe-xsession/xserver-common" -DEPEND="${DEPEND} - ${RDEPEND}" -- cgit v1.2.3-65-gdbad