x11-base/xorg-server : use Gentoo's build

5 files changed, 17 insertions, 43 deletions

diff --git a/sys-apps/baselayout/baselayout-2.13-r3.ebuild b/sys-apps/baselayout/baselayout-2.13-r4.ebuild
index a361b3fd..cbfd0b2c 100644
--- a/sys-apps/baselayout/baselayout-2.13-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.13-r4.ebuild
@@ -266,7 +266,7 @@ src_prepare() {
 	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
 
 	# rc-scripts version for testing of features that *should* be present
-	echo "Redcore Linux Hardened - rolling" > etc/redcore-release
+	echo "Redcore Linux Hardened - rolling_boulder_uphill" > etc/redcore-release
 }
 
 src_install() {
@@ -340,6 +340,10 @@ src_install() {
 	insinto /lib/udev/rules.d
 	newins ${FILESDIR}/ioschedcfg 60-iosched.rules
 	#
+	# Xorg
+	dodir /usr/share/X11/xorg.conf.d
+	insinto /usr/share/X11/xorg.conf.d
+	newins ${FILESDIR}/xorgcfg 80-synaptics-overrides.conf
 	##############################################
 }
 
diff --git a/sys-apps/baselayout/files/baselayout-2.13-redcore.patch b/sys-apps/baselayout/files/baselayout-2.13-redcore.patch
index f7bf014f..b3247d17 100644
--- a/sys-apps/baselayout/files/baselayout-2.13-redcore.patch
+++ b/sys-apps/baselayout/files/baselayout-2.13-redcore.patch
@@ -11,7 +11,7 @@ diff -Nur a/Makefile b/Makefile
  	$(INSTALL_DIR) $(DESTDIR)/usr/lib
  	ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
 -	./make_os_release ${PV} > $(DESTDIR)/usr/lib/os-release
-+	./make_os_release rolling > $(DESTDIR)/usr/lib/os-release
++	./make_os_release rolling_boulder_uphill > $(DESTDIR)/usr/lib/os-release
  	$(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
  	cp -pPR share/* $(DESTDIR)/usr/share/baselayout/
  	ln -snf ../proc/self/mounts $(DESTDIR)/etc/mtab
diff --git a/sys-apps/baselayout/files/baselayout-2.8-redcore.patch b/sys-apps/baselayout/files/baselayout-2.8-redcore.patch
deleted file mode 100644
index ef24e25a..00000000
--- a/sys-apps/baselayout/files/baselayout-2.8-redcore.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur a/Makefile b/Makefile
---- a/Makefile	2021-09-27 22:48:05.000000000 +0100
-+++ b/Makefile	2022-09-21 12:52:08.248406011 +0100
-@@ -63,12 +63,11 @@
- install:
- 	$(INSTALL_DIR) $(DESTDIR)/etc
- 	cp -pPR etc/* etc.$(OS)/* $(DESTDIR)/etc/
--	echo "Gentoo Base System release ${PV}" > ${DESTDIR}/etc/gentoo-release
- 	$(INSTALL_DIR) $(DESTDIR)/lib
- 	cp -pPR lib.$(OS)/* $(DESTDIR)/lib/
- 	$(INSTALL_DIR) $(DESTDIR)/usr/lib
- 	ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
--	./make_os_release ${OS} ${PV} > $(DESTDIR)/usr/lib/os-release
-+	./make_os_release ${OS} rolling > $(DESTDIR)/usr/lib/os-release
- 	$(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
- 	cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/
- 
-diff -Nur a/make_os_release b/make_os_release
---- a/make_os_release	2021-09-27 22:48:05.000000000 +0100
-+++ b/make_os_release	2022-09-21 12:49:21.760390518 +0100
-@@ -4,12 +4,12 @@
- 	exit 1
- fi
- cat <<EOF
--NAME=Gentoo
--ID=gentoo
--PRETTY_NAME="Gentoo ${1}"
-+NAME=Redcore
-+ID=redcore
-+PRETTY_NAME="Redcore ${1} Hardened"
- ANSI_COLOR="1;32"
--HOME_URL="https://www.gentoo.org/"
--SUPPORT_URL="https://www.gentoo.org/support/"
--BUG_REPORT_URL="https://bugs.gentoo.org/"
-+HOME_URL="https://redcorelinux.org/"
-+SUPPORT_URL="https://wiki.redcorelinux.org/"
-+BUG_REPORT_URL="https://bugs.redcorelinux.org/"
- VERSION_ID="${2}"
- EOF
diff --git a/sys-apps/baselayout/files/xorgcfg b/sys-apps/baselayout/files/xorgcfg
new file mode 100644
index 00000000..deb640fb
--- /dev/null
+++ b/sys-apps/baselayout/files/xorgcfg
@@ -0,0 +1,9 @@
+# Enable clicks using touchpad (https://bugs.redcorelinux.org/show_bug.cgi?id=48)
+
+Section "InputClass"
+	Identifier  "touchpad overrides"
+	MatchDriver  "synaptics"
+	Option  "TapButton1"  "1"
+	Option  "VertEdgeScroll"  "1"
+	Option "RBCornerButton" "3"
+EndSection
diff --git a/sys-apps/lsb-release/lsb-release-3.2-r1.ebuild b/sys-apps/lsb-release/lsb-release-3.2-r2.ebuild
index 785bb114..0357f2a7 100644
--- a/sys-apps/lsb-release/lsb-release-3.2-r1.ebuild
+++ b/sys-apps/lsb-release/lsb-release-3.2-r2.ebuild
@@ -37,7 +37,7 @@ src_install() {
 	dodir /etc
 	cat > "${D}/etc/lsb-release" <<- EOF
 		DISTRIB_ID="Redcore"
-		DISTRIB_RELEASE="rolling"
-		DISTRIB_DESCRIPTION="Redcore Linux Hardened - rolling"
+		DISTRIB_RELEASE="rolling_boulder_uphill"
+		DISTRIB_DESCRIPTION="Redcore Linux Hardened - rolling_boulder_uphill"
 	EOF
 }