gentoo resync : 22.01.2019

4 files changed, 6 insertions, 68 deletions

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 4cbca5aac421..a12ebb0935b5 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -2,10 +2,8 @@ AUX dmenu-4.6-gentoo.patch 1134 BLAKE2B 4df80fcec2f35777ff25e0600798e1101bcc7f1c
 AUX dmenu-4.7-gentoo.patch 1153 BLAKE2B eebeac590f6fd759a5524c2613419ef65ddc6f9c4b3f8c24ed9e734a244ae14c8787dbd67c1a6d8d4d94f09f8b6cd73f2672dd321761beba82e7425086f1479c SHA512 14e286b582895985403babc6084b096075f759e0e4a8acf231508cbf4fd5a70e95638f9f99aa35bef72e656b85642bb088f5b4052d703a2b852a787902b23e27
 AUX dmenu-9999-gentoo.patch 561 BLAKE2B 6c0d69737040068fae1ed2286902d2afea9e4ce6be4f3a1682bae4de8477953e50f92b137a0b347434027ec9f31dc635a0980aa12ac2f59ca16862284eed56e9 SHA512 4896a7fa15630650c028073a45856d0680c8e84c14dcf6b5bb0fc02b2303f460d4ee91730ddfb7684ac6c46e24d1651a46539b080feb61d130944dc47fa14af4
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
-DIST dmenu-4.7.tar.gz 15597 BLAKE2B d942c541a0e76d7287c85073324b0107224256d944a87f575e02238a10f16eb62d1eee06182da91242c049e3b17fa4068be72ffd1c70f6a7bbf5a0596fe62162 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
-EBUILD dmenu-4.7-r1.ebuild 1327 BLAKE2B 0646edee514a726203e4c30bfb62ec930f363824759b6d83f6afb42e4f573e0ab781e3c8305229f698209fbcc84a056f2ffb5456f36d6e804545a29974e967e4 SHA512 3262456f61e12f996bcecfcdebf2cf963bff0a3682b25b6881955c875c09586800f0c4acd43963798ab81f30cf6631c990a14a0dcaa8d0a53f1183d78491ee54
-EBUILD dmenu-4.8.ebuild 1321 BLAKE2B b77fa651f585fe815894907a1b377462cb1a357845dded9dfee2246292599ced8238ca771b86741c29f581e6d3b67a272e0984f6e7bf023344c0030b03eca317 SHA512 bcb386fe847a5cce843f6f05779b4b4e4d7abb7b80294aec3be2865a01455a7c62c5ca874e1dce9e45ba2b0a8cb6c5531d2820529a5f4480e803cdfc2e11652f
-EBUILD dmenu-9999.ebuild 1151 BLAKE2B 9c85ecf080068cbac6b58ef558ae99747a854fdd34372e9d5d53513e66af64cbc73dc3b56cdea4428eb2c3ba632cb909e2c87db011d4fa3079cc36c1a0a0922d SHA512 3f5ce19b865487b2ab20e35d05086818c81fc0e315fe4b7e1f8b840ab2e3bb87b0dde735e3a73d7af270e96e73ba70174a25ec35ff4ccbd5dc0de1f776108163
+EBUILD dmenu-4.8.ebuild 1331 BLAKE2B cd9a7d863e5f1ebcf407a9b8679770e5710ef473329b3fd21c2502cd238a8e35325f2cd1b6feb1746230d17364a0f1fa1ce1d346f71ec97e977221e3100f3d6b SHA512 d7616941e416beb543b0abd4b7ed16e7b157c36fe5e454ef7a1c9a5a78ec4de5c10ee34b7f4b749b6e77c012b82437acf87a374d883c56047cdee09fd30ced6b
+EBUILD dmenu-9999.ebuild 1158 BLAKE2B 1f70618cd79408543653a9d4288a25e0b40ca7f141596ce66154c70dfbc85405cfca8a748eb14e54662e057ff41d5308f3c7cbb90922b90d7da88b678c860bdd SHA512 c45538edf8b4a9d3c000984634833c8e226d0a75ad647c56935b3c6fa3a435db9d210f47aaca076d086bbf0ef0ae584d8fddd37c9796082552e5c70461b16ee2
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.7-r1.ebuild b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
deleted file mode 100644
index 1bf43050b79d..000000000000
--- a/x11-misc/dmenu/dmenu-4.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 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
-	x11-base/xorg-proto
-"
-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.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 7d0c6c78aff3..aaf42bf59d99 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,7 +54,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	save_config config.h
 }
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index f2222c4d6bc8..8001b06f1d66 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	save_config config.h
 }