From d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 31 Oct 2017 15:47:53 +0000
Subject: gentoo resync : 31.10.2017

---
 x11-misc/dmenu/Manifest            |  4 +--
 x11-misc/dmenu/dmenu-4.7-r1.ebuild | 61 ++++++++++++++++++++++++++++++++++++++
 x11-misc/dmenu/dmenu-4.7.ebuild    | 57 -----------------------------------
 x11-misc/dmenu/dmenu-9999.ebuild   |  4 +--
 4 files changed, 65 insertions(+), 61 deletions(-)
 create mode 100644 x11-misc/dmenu/dmenu-4.7-r1.ebuild
 delete mode 100644 x11-misc/dmenu/dmenu-4.7.ebuild

(limited to 'x11-misc/dmenu')

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 0ce5c3579fa0..29a20dc28d05 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -4,8 +4,8 @@ AUX dmenu-9999-gentoo.patch 1039 SHA256 0498d9bb4a27c7fdf18db10ed0f3d49eafa7cf6b
 DIST dmenu-4.6.tar.gz 15057 SHA256 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 WHIRLPOOL b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d
 DIST dmenu-4.7.tar.gz 15597 SHA256 a75635f8dc2cbc280deecb906ad9b7594c5c31620e4a01ba30dc83984881f7b9 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c WHIRLPOOL 6acb632c06374c92bce2a2951bebbcd81c9f5529c6a44859e86d92d8aace52c847a542bb2a0c34d69cb0a8e4cdb525bbe9d82885c0ae8f79004c90094d21069b
 EBUILD dmenu-4.6.ebuild 1304 SHA256 c7603b5833570749eb095a0e7566b81309051bcfdf3e114a34cda2203304dac1 SHA512 7f18e03b71c1624a8e12d3afaac86471d45fbd1112474d13c3e09f32d05f08aa70104e694e467b98f22ea7174396c682e2febefa78d4104a16dc063c421a5e3f WHIRLPOOL 3b597ba5a8ff62e93213e9b88f58a518bd676504ab02eeb7187d8328c0994cdee3243300ed0e319bc5f9c828d7965bdc9eeb57baa7a3fcb7da9fe2087b93e0a8
-EBUILD dmenu-4.7.ebuild 1302 SHA256 91b9ffed6ceb0875f956714558ab94eca9d5454776dda92ae7312166f4f80d3a SHA512 283f8a77e9465a4653ae535a238e0810af0a3e352971adfab43d25e678bb47071a9fff7a052fbb91efacd8f65630a1ccb4932e31cb98826f81a6a36be7d9ac8e WHIRLPOOL 757dc3f23d7dc2298762e947900d3e0e45273bc8e26c86caa764cc8d236e94e52ce5c4eb0b7ce570f6877f4308b1b88b084af1f1ae48ecc39175988b6b001928
-EBUILD dmenu-9999.ebuild 1324 SHA256 a8d79398476e6bd7508c8bfd371ece25250e904be32a4b03b16a04afe6a782af SHA512 2e2140d652568a9fb9a09e1c51ca8170e29b508d0980ba42e94fb1549c952483c34ef24dea524035692c875529802d189cef49ada040648c3d6f6d18beb6fa3f WHIRLPOOL c8985fa2e00635629752ca5c530da71f97918c5463188a8eb4a779d0412e944078b633e65d5f8845c53c4666164be27acd30b1a80c541528b0a9415c20847c07
+EBUILD dmenu-4.7-r1.ebuild 1363 SHA256 77030fdf184d77f464571cd4c4c5dc69d2a594812da65f371281500be273341c SHA512 ce758035973b61c24c01d23e96cae27e519698a2230ebd5366daf8126a7e065bbc3bc300467264c6f658042834f1fa4d46839894593c2bbd6caf3054f3fc15ac WHIRLPOOL ed70807515a83255d049fd8b757423af5b20557c04092703424af69c1a5038a78d82eca94f191f36a18a4d327c4ccdd2d05d788521d849168253a608727cdd68
+EBUILD dmenu-9999.ebuild 1316 SHA256 ddea2ca63020bc625cae055cba7d873f07a6507cebdef77ac0d3a45c301c0211 SHA512 84690f28a5a3e65b933e8340d46adfe93ddc7c08f088d4af999118b1c6d13d796b1ba80c4e22507f5be0f586a66ab355c6fa193e31e1fa535c0a24f6ce52011b WHIRLPOOL ebd2f12e02c6fc574d22d18ae04ef9ab657287473cacf8fee2e39fb539c6c4411c300c46cacf8083b1253632400950e505b93254659ae9af6ace83a0447af479
 MISC ChangeLog 4831 SHA256 468ac7522e00c7ea68f5b7d6a7c4819afff27ae891026a7a5dcd0e6a4b3c3a31 SHA512 f7281c270889bb598c9e94294ee7a16ef2ef0292a12fbceef9be76b60e70897056ca757272faa7d301fc345120cb488d052cd84e29d13d29103293b028a0d553 WHIRLPOOL 2126db4dd07b6f80624f24975802bb99adc203509ab9c24f0f2d48706241f813c0e5f699b66f8c10036e6f71a3489109ad931f521cb6104e50013dc31a8f8068
 MISC ChangeLog-2015 12846 SHA256 589a246ea7e73bbe10b5351404966d6a0eab4d8d252efc7102ef0b8549fe36d8 SHA512 837f61b7a2c39aaced2178ae733738305f50d0fd4a3a5f09b056d2a2d0e8f9af0fceaf9f7387cf3bd3adaee85f8942fdbc59b6b31039c65b6c0341761a6c8a61 WHIRLPOOL 4df426814e80259c1b25e53581479f0cb73ae2d48f8a1f7c3fc00aaec83613c3ebd3fb3142597b62d4db5b4d1613860792bb8223c753a4c70e896c6206ec860d
 MISC metadata.xml 361 SHA256 c1f52ae4430599b171ae573b75e63d240afd6140e79456197f24264398fee204 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476 WHIRLPOOL f9e3d50557c4d5830633c331f5a037b769adf581e55486a79a877f3d98483c9aed0e4a5b2bc9a7a0d8d3df57feeb6dbd0fd628e16241baa37cd729397fc834de
diff --git a/x11-misc/dmenu/dmenu-4.7-r1.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
new file mode 100644
index 000000000000..05dc375cb2ba
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="https://tools.suckless.org/dmenu/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xproto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+		)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	save_config config.h
+}
diff --git a/x11-misc/dmenu/dmenu-4.7.ebuild b/x11-misc/dmenu/dmenu-4.7.ebuild
deleted file mode 100644
index 47042fad0e71..000000000000
--- a/x11-misc/dmenu/dmenu-4.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
-HOMEPAGE="https://tools.suckless.org/dmenu/"
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="xinerama"
-
-RDEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xproto
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|^	@|	|g' \
-		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-		-e '/^	echo/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) \
-		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
-		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
-		"XINERAMAFLAGS=$(
-			usex xinerama "-DXINERAMA $(
-				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
-			)" ''
-		)" \
-		"XINERAMALIBS=$(
-			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
-		)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index ebd674d62328..e55ea2292231 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 		-e '/^	echo/d' \
 		Makefile || die
 
-	restore_config config.def.h
+	restore_config config.h
 }
 
 src_compile() {
@@ -57,5 +57,5 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
 
-	save_config config.def.h
+	save_config config.h
 }
-- 
cgit v1.2.3