From 27c5510f6420071fee062901df4061210f329603 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Mon, 21 May 2018 20:25:05 +0200
Subject: x11-libs/dnd: Update x11-proto/xproto dependency to
 x11-base/xorg-proto and drop it from RDEPEND.

Drop unused inheritance of eutils.eclass.
---
 x11-libs/dnd/dnd-1.1-r1.ebuild |  6 +++---
 x11-libs/dnd/dnd-1.1-r2.ebuild | 41 -----------------------------------------
 x11-libs/dnd/dnd-1.1-r3.ebuild | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 44 deletions(-)
 delete mode 100644 x11-libs/dnd/dnd-1.1-r2.ebuild
 create mode 100644 x11-libs/dnd/dnd-1.1-r3.ebuild

(limited to 'x11-libs')

diff --git a/x11-libs/dnd/dnd-1.1-r1.ebuild b/x11-libs/dnd/dnd-1.1-r1.ebuild
index e649cca800d8..e9127cc93025 100644
--- a/x11-libs/dnd/dnd-1.1-r1.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r1.ebuild
@@ -19,9 +19,9 @@ RDEPEND=">=x11-libs/libX11-1.0.0
 	>=x11-libs/libXt-1.0.0
 	>=x11-libs/libICE-1.0.0
 	>=x11-libs/libSM-1.0.0
-	>=x11-libs/libXaw-1.0.1
-	>=x11-proto/xproto-7.0.4"
-DEPEND="${RDEPEND}"
+	>=x11-libs/libXaw-1.0.1"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-libs/dnd/dnd-1.1-r2.ebuild b/x11-libs/dnd/dnd-1.1-r2.ebuild
deleted file mode 100644
index 1859fa9f7199..000000000000
--- a/x11-libs/dnd/dnd-1.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="OffiX' Drag'n'drop library"
-HOMEPAGE="http://leb.net/offix"
-SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
-
-RDEPEND="
-	x11-libs/libXt
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libICE
-	x11-libs/libXaw
-	x11-proto/xproto"
-
-DEPEND="
-	${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.diff
-	"${FILESDIR}"/Makefile-fix.patch
-)
-
-S="${WORKDIR}/DND/DNDlib"
-
-src_configure() {
-	tc-export CC CXX RANLIB AR
-	econf --with-x
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-}
diff --git a/x11-libs/dnd/dnd-1.1-r3.ebuild b/x11-libs/dnd/dnd-1.1-r3.ebuild
new file mode 100644
index 000000000000..db03f5042758
--- /dev/null
+++ b/x11-libs/dnd/dnd-1.1-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="OffiX' Drag'n'drop library"
+HOMEPAGE="http://leb.net/offix"
+SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.diff
+	"${FILESDIR}"/Makefile-fix.patch
+)
+
+S="${WORKDIR}/DND/DNDlib"
+
+src_configure() {
+	tc-export CC CXX RANLIB AR
+	econf --with-x
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+}
-- 
cgit v1.2.3-65-gdbad