summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelo Arrifano <miknix@gentoo.org>2009-06-12 01:24:22 +0000
committerroot <root@miranda.amd64.dev.gentoo.org>2009-06-12 01:24:22 +0000
commit1bcf490b68b6b9349f57d6b8556654c18d57ccfd (patch)
tree6fd6da1497001b4f7b650a934973474d219ee175 /gpe-base/gpe-login
parent[gpe-base/gpe-login] Cleanup gpe-login scripts. (diff)
downloadgpe-1bcf490b68b6b9349f57d6b8556654c18d57ccfd.tar.gz
gpe-1bcf490b68b6b9349f57d6b8556654c18d57ccfd.tar.bz2
gpe-1bcf490b68b6b9349f57d6b8556654c18d57ccfd.zip
[gpe-base/gpe-login] Make it remove ugly sysconf files.HEADmaster
Diffstat (limited to 'gpe-base/gpe-login')
-rw-r--r--gpe-base/gpe-login/Manifest3
-rw-r--r--gpe-base/gpe-login/gpe-login-0.95-r3.ebuild13
2 files changed, 10 insertions, 6 deletions
diff --git a/gpe-base/gpe-login/Manifest b/gpe-base/gpe-login/Manifest
index a68309e..8494191 100644
--- a/gpe-base/gpe-login/Manifest
+++ b/gpe-base/gpe-login/Manifest
@@ -7,7 +7,8 @@ AUX gpe-login.xinit-gentoo 402 SHA1 02c40d2286b0b5ec820f298d0092cb8e673b7e3e SHA
AUX locale.default-gentoo 45 SHA1 0a5e46321bd5a53ff9a09b914f0aa742b80ab561 SHA256 6cecdcb10f69896afaaae5cd84c4077409f93ac54d561e137b935a965f6000b9
DIST gpe-login-0.95.tar.bz2 160704 SHA1 8f689fd43322cc266a17b93e60e2c7635d933983 SHA256 8bea38af14c98354b1ee023475315ae3ba462d33b136a73cde9d83303b659d84
EBUILD gpe-login-0.95-r1.ebuild 1668 SHA1 ac3c53f6e2ed43a5df8fe45008a5a04c2c560f80 SHA256 28a33e2c5f21b6bb7f6dffe3940c802a373b0ac8449557409066ea9cb838d092
-EBUILD gpe-login-0.95-r3.ebuild 1891 SHA1 f75fd74149d4b626484bd3bef250616433722c9b SHA256 e46a65d7d50fc49ca3ce04d3940b88db1cdc235c3c6ad8fdac83c39aa23fb899
+EBUILD gpe-login-0.95-r2.ebuild 1771 SHA1 a3d9305cdfdc67db35c366a7f2e020b13a7bb401 SHA256 6d42c85f80c28364ffa08ca6b28b11531800e20bc2da2d503e2f576134627cb8
+EBUILD gpe-login-0.95-r3.ebuild 2040 SHA1 fa600e927271ea1791eb74e81e0dc78f366a7da4 SHA256 7f201deb19e127f3e7c37e8b2e86914d06166628f098d448eeceb66882b4b6de
EBUILD gpe-login-0.95.ebuild 1305 SHA1 e62e09747e23ce0d07e541dacfe769706eb30921 SHA256 1d62c3506a8f45402fd0bd35c421718e5761d445a7a5ec7bce84a8250bdd3ff0
MISC ChangeLog 713 SHA1 9ecb2e42cdfb2f3ceba0658b457383a5cb09f3de SHA256 29a83fc33ce430a9f817bb0db9d100a5176405ec04024162d30f726360d67f9a
MISC metadata.xml 215 SHA1 7cdcbeff68c19a0ecc3bcb46b2bd094ee69cd48d SHA256 b80ac51746e7677bc32591254e54b62c49f2c6cc134fe2a29247958ba9a58a5f
diff --git a/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild b/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild
index bb635c7..5c25d21 100644
--- a/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild
+++ b/gpe-base/gpe-login/gpe-login-0.95-r3.ebuild
@@ -32,11 +32,19 @@ src_unpack() {
# Use our gentooish scripts instead
for gfile in $gentoo_files; do
+ einfo "Replacing ${gfile}"
cp "${FILESDIR}/${gfile}-gentoo" "${gfile}" \
|| die "Replace ${gfile} fail"
chmod 0755 ${gfile} || die "Cannot chmod ${gfile}"
done
+ # We dont want these
+ sed -i -e 's;X11/gpe-login.gtkrc;;g' \
+ -e 's;gpe-login.keylaunchrc;;g' \
+ -e 's;mv gpe-login.sysconfig gpelogin;true;' \
+ -e 's;gpe-login.sysconfig;;g' Makefile.in \
+ || die "Sed failed 0xff"
+
# We fixed gpe-dm to use this path
sed -i -e 's;/X11/Xinit.d;/X11/gpe-dm/Xinit.d;g' Makefile.in \
|| die "Sed failed for file Xinit.d"
@@ -45,11 +53,6 @@ src_unpack() {
src_install() {
gpe_src_install "$@"
- # FIXME: Remove these
- # /etc/X11/gpe-login.gtkrc
- # /etc/X11/gpe-login.keylaunchrc
- # /etc/sysconfig/gpelogin
-
insinto /etc/X11/
newins "${FILESDIR}/gpe-login.geometry-gentoo" gpe-login.geometry
insinto /etc/gpe/