From 6f8ee1a8fca415b525ad09e86c09154615353e6a Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 5 Dec 2020 21:08:55 +0000
Subject: Remove gtk support from ocfs2-tools

Requires python2.x
---
 sys-fs/ocfs2-tools/Manifest                    |  2 +-
 sys-fs/ocfs2-tools/ocfs2-tools-1.8.6-r1.ebuild | 62 ++++++++++++++++++++++++
 sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild    | 67 --------------------------
 3 files changed, 63 insertions(+), 68 deletions(-)
 create mode 100644 sys-fs/ocfs2-tools/ocfs2-tools-1.8.6-r1.ebuild
 delete mode 100644 sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild

diff --git a/sys-fs/ocfs2-tools/Manifest b/sys-fs/ocfs2-tools/Manifest
index c806599..06d14ba 100644
--- a/sys-fs/ocfs2-tools/Manifest
+++ b/sys-fs/ocfs2-tools/Manifest
@@ -5,4 +5,4 @@ DIST ocfs2-tools-1.8.4.2.tar.gz 1481445 BLAKE2B 056b84eceb374662ee036c5700587923
 DIST ocfs2-tools-1.8.6.tar.gz 1492057 BLAKE2B 0275d10d4b07c20cb99920bc522331f9c51f77e6d978807b02c32ae732eeb1b1ab666e26afe70ead2c029d17e3aa0b0347d80e808458fbea1e32783a1a942f7b SHA512 71abe46152b065b9ba7db192b9f14ed28a1fbf0fa68822d4e8188c6f1654dfaaa29ae72ea4219bd68e7fade7791a08d36cbd5af5a16a2ee96e194ecb6f0d950b
 EBUILD ocfs2-tools-1.8.4.1-r1.ebuild 1473 BLAKE2B 6596a4513f00a689d59c0140b62b353ae37c35c3ab6377ef52c2dc73bef822e99e79c9c81ec3ee299a94c4f45abf1a17fd3bc30a3d3ef9fd08407da627205a8e SHA512 da1df0bc34b6629987010e308c7c9413c231982f5a10d8921907b9aff6b93dcd6c041996e562b307c3f396b8fdb005799a25c458abf3bf75a5ca27c1ecb24bcd
 EBUILD ocfs2-tools-1.8.4.2.ebuild 1473 BLAKE2B 6596a4513f00a689d59c0140b62b353ae37c35c3ab6377ef52c2dc73bef822e99e79c9c81ec3ee299a94c4f45abf1a17fd3bc30a3d3ef9fd08407da627205a8e SHA512 da1df0bc34b6629987010e308c7c9413c231982f5a10d8921907b9aff6b93dcd6c041996e562b307c3f396b8fdb005799a25c458abf3bf75a5ca27c1ecb24bcd
-EBUILD ocfs2-tools-1.8.6.ebuild 1474 BLAKE2B c6bacd581f3a891b28dd5dcf9af87a32f5149a45e92571894171584c0c03275b3616f7bf0704ed5f0935f925e290469bb3dcb3145d708b764048115ebc92f90b SHA512 9083976bb24785f327e260a1708b0a7146ef185cf9b18d023d3b764f177c24db03a90301e99924da9d31da85586e2cd9aebb1a6abbb6751c87feb12a35d0b419
+EBUILD ocfs2-tools-1.8.6-r1.ebuild 1371 BLAKE2B c87b808adea9339c85dd793a3ac2afcca93a6f6690c58fec83febfb42f9ce606f0ff11f7a8e30c0820c95d815c400ba73da613cef1f0e0b84e384fb7f0998a4c SHA512 1fbf6908898ddfc2ba1bed061edad56cf877a28497c55b05372a1c328900a1a17da4dbc4d0242cf46b0a4a28f070c956fcc7b687c1ae89ed822d09ad9cf14ba8
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6-r1.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6-r1.ebuild
new file mode 100644
index 0000000..d162272
--- /dev/null
+++ b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="7"
+
+DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2"
+HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/ https://github.com/markfasheh/ocfs2-tools"
+SRC_URI="https://github.com/markfasheh/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug external"
+
+RDEPEND="
+	dev-libs/libaio
+	sys-apps/util-linux
+	external? (
+		sys-cluster/libdlm
+		sys-cluster/pacemaker[-heartbeat]
+		)
+	sys-fs/e2fsprogs
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-process/psmisc
+"
+# 99% of deps this thing has is automagic
+# specialy cluster things corosync/pacemaker
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${P}"
+
+DOCS=(
+	"${S}/documentation/samples/cluster.conf"
+	"${S}/documentation/users_guide.txt"
+)
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	default
+	# gentoo uses /sys/kernel/dlm as dlmfs mountpoint
+	sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \
+		-i libo2dlm/o2dlm_test.c \
+		-i libocfs2/dlm.c || die "sed failed"
+	AT_M4DIR=. eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug debug) \
+		$(use_enable debug debugexe) \
+		$(use_enable gtk ocfs2console) \
+		--enable-dynamic-fsck \
+		--enable-dynamic-ctl
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/ocfs2.initd" ocfs2
+	newconfd "${FILESDIR}/ocfs2.confd" ocfs2
+}
diff --git a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild b/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild
deleted file mode 100644
index 94e5992..0000000
--- a/sys-fs/ocfs2-tools/ocfs2-tools-1.8.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Support programs for the Oracle Cluster Filesystem 2"
-HOMEPAGE="http://oss.oracle.com/projects/ocfs2-tools/ https://github.com/rascalDan/ocfs2-tools"
-SRC_URI="https://github.com/markfasheh/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug external gtk"
-
-RDEPEND="
-	dev-libs/libaio
-	sys-apps/util-linux
-	external? (
-		sys-cluster/libdlm
-		sys-cluster/pacemaker[-heartbeat]
-		)
-	sys-fs/e2fsprogs
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-process/psmisc
-	gtk? (
-		dev-python/pygtk
-	)
-"
-# 99% of deps this thing has is automagic
-# specialy cluster things corosync/pacemaker
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${P}"
-
-DOCS=(
-	"${S}/documentation/samples/cluster.conf"
-	"${S}/documentation/users_guide.txt"
-)
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	default
-	# gentoo uses /sys/kernel/dlm as dlmfs mountpoint
-	sed -e 's:"/dlm/":"/sys/kernel/dlm":g' \
-		-i libo2dlm/o2dlm_test.c \
-		-i libocfs2/dlm.c || die "sed failed"
-	AT_M4DIR=. eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug debug) \
-		$(use_enable debug debugexe) \
-		$(use_enable gtk ocfs2console) \
-		--enable-dynamic-fsck \
-		--enable-dynamic-ctl
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}/ocfs2.initd" ocfs2
-	newconfd "${FILESDIR}/ocfs2.confd" ocfs2
-}
-- 
cgit v1.2.3