summaryrefslogtreecommitdiff
path: root/x11-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2015-07-24 17:12:35 +0100
committerV3n3RiX <venerix@rogentos.ro>2015-07-24 17:12:35 +0100
commit70b1855e16ed079d320176747f40e98693623952 (patch)
tree6661d84aeb2127a71fa2001856a941ca1425af24 /x11-misc
parentdf385d64c8534771af36e9a464fb1763f5f37078 (diff)
parent5c8180e20f801d69d51cca9c09c773f120e7bb64 (diff)
Merge upstream
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild3
-rw-r--r--x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild3
-rw-r--r--x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild3
-rw-r--r--x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild1
4 files changed, 7 insertions, 3 deletions
diff --git a/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild b/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild
index ca1c16e7..baff4b25 100644
--- a/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild
+++ b/x11-misc/lightdm-base/lightdm-base-1.10.3.ebuild
@@ -8,6 +8,7 @@ inherit autotools eutils pam readme.gentoo systemd versionator
TRUNK_VERSION="$(get_version_component_range 1-2)"
REAL_PN="${PN/-base}"
REAL_P="${P/-base}"
+MY_PN="lightdm"
DESCRIPTION="A lightweight display manager, base libraries and programs"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz
@@ -44,7 +45,7 @@ src_prepare() {
einfo "Fixing the session-wrapper variable in lightdm.conf"
sed -i -e \
- "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ "/session-wrapper/s@^.*@session-wrapper=/etc/${MY_PN}/Xsession@" \
data/lightdm.conf || die "Failed to fix lightdm.conf"
epatch_user
diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild
index 1657b27c..5b5ba3a7 100644
--- a/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild
+++ b/x11-misc/lightdm-base/lightdm-base-1.12.2.ebuild
@@ -8,6 +8,7 @@ inherit autotools eutils pam readme.gentoo systemd versionator
TRUNK_VERSION="$(get_version_component_range 1-2)"
REAL_PN="${PN/-base}"
REAL_P="${P/-base}"
+MY_PN="lightdm"
DESCRIPTION="A lightweight display manager, base libraries and programs"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz
@@ -44,7 +45,7 @@ src_prepare() {
einfo "Fixing the session-wrapper variable in lightdm.conf"
sed -i -e \
- "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ "/session-wrapper/s@^.*@session-wrapper=/etc/${MY_PN}/Xsession@" \
data/lightdm.conf || die "Failed to fix lightdm.conf"
epatch_user
diff --git a/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild b/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild
index 5055d565..f9c04258 100644
--- a/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild
+++ b/x11-misc/lightdm-base/lightdm-base-1.12.3.ebuild
@@ -8,6 +8,7 @@ inherit autotools eutils pam readme.gentoo systemd versionator
TRUNK_VERSION="$(get_version_component_range 1-2)"
REAL_PN="${PN/-base}"
REAL_P="${P/-base}"
+MY_PN="lightdm"
DESCRIPTION="A lightweight display manager, base libraries and programs"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
SRC_URI="http://launchpad.net/${REAL_PN}/${TRUNK_VERSION}/${PV}/+download/${REAL_P}.tar.xz
@@ -44,7 +45,7 @@ src_prepare() {
einfo "Fixing the session-wrapper variable in lightdm.conf"
sed -i -e \
- "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ "/session-wrapper/s@^.*@session-wrapper=/etc/${MY_PN}/Xsession@" \
data/lightdm.conf || die "Failed to fix lightdm.conf"
epatch_user
diff --git a/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild b/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild
index cf7dc90e..91a02042 100644
--- a/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild
+++ b/x11-misc/lightdm-qt4/lightdm-qt4-1.12.2.ebuild
@@ -43,6 +43,7 @@ src_configure() {
--disable-static \
--disable-tests \
--disable-introspection \
+ --enable-liblightdm-gobject \
--enable-liblightdm-qt \
--disable-liblightdm-qt5
}