diff options
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gdm/gdm-3.36.3.ebuild | 7 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-3.36.4.ebuild | 7 | ||||
| -rw-r--r-- | gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild | 11 | ||||
| -rw-r--r-- | gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild | 7 |
4 files changed, 18 insertions, 14 deletions
diff --git a/gnome-base/gdm/gdm-3.36.3.ebuild b/gnome-base/gdm/gdm-3.36.3.ebuild index 7b8b1e592dca..93db1164a50e 100644 --- a/gnome-base/gdm/gdm-3.36.3.ebuild +++ b/gnome-base/gdm/gdm-3.36.3.ebuild @@ -5,7 +5,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" GNOME2_EAUTORECONF="yes" -inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user +inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM" @@ -187,10 +187,11 @@ src_configure() { ) if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` - SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` + SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")" + SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")" ) fi diff --git a/gnome-base/gdm/gdm-3.36.4.ebuild b/gnome-base/gdm/gdm-3.36.4.ebuild index 12a42230f315..8a86e224747e 100644 --- a/gnome-base/gdm/gdm-3.36.4.ebuild +++ b/gnome-base/gdm/gdm-3.36.4.ebuild @@ -5,7 +5,7 @@ EAPI=6 GNOME2_LA_PUNT="yes" GNOME2_EAUTORECONF="yes" -inherit eutils gnome2 pam readme.gentoo-r1 systemd udev user +inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" HOMEPAGE="https://wiki.gnome.org/Projects/GDM" @@ -187,10 +187,11 @@ src_configure() { ) if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( --with-initial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null` - SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null` + SYSTEMD_CFLAGS="$(${pkgconfig} --cflags "libelogind")" + SYSTEMD_LIBS="$(${pkgconfig} --libs "libelogind")" ) fi diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild index 033c47fe3410..b0eb921b5595 100644 --- a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild +++ b/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit gnome2 +inherit gnome2 toolchain-funcs DESCRIPTION="GNOME Flashback session" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-flashback/" @@ -71,11 +71,12 @@ src_configure() { fi if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( - DESKTOP_CFLAGS=`pkg-config --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null` - DESKTOP_LIBS=`pkg-config --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11 2>/dev/null` - SCREENSAVER_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null` - SCREENSAVER_LIBS=`pkg-config --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm 2>/dev/null` + DESKTOP_CFLAGS="$(${pkgconfig} --cflags glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)" + DESKTOP_LIBS="$(${pkgconfig} --libs glib-2.0 gio-2.0 gio-unix-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind x11)" + SCREENSAVER_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)" + SCREENSAVER_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 glib-2.0 gnome-desktop-3.0 gtk+-3.0 libelogind xxf86vm)" ) fi diff --git a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild index a2d70aaaaf63..c33ffe3fbb7c 100644 --- a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild +++ b/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eapi7-ver gnome2 +inherit eapi7-ver gnome2 toolchain-funcs DESCRIPTION="The GNOME Flashback Panel" HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/" @@ -61,9 +61,10 @@ src_configure() { fi if use elogind; then + local pkgconfig="$(tc-getPKG_CONFIG)" myconf+=( - MENU_CFLAGS=`pkg-config --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null` - MENU_LIBS=`pkg-config --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind 2>/dev/null` + MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)" + MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)" ) fi |