subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: x11\-misc\/dmenu\/"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-06-22 Thread Conrad Kostecki

commit: d73d14c4807f4ac6304f5b9fb38475a350717102
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Jun 22 19:59:23 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jun 22 20:00:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73d14c4

x11-misc/dmenu: drop 5.2

Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-misc/dmenu/Manifest |  1 -
 x11-misc/dmenu/dmenu-5.2.ebuild | 62 -
 2 files changed, 63 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 153676f0aeb1..1a8e433206cb 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,2 +1 @@
-DIST dmenu-5.2.tar.gz 16196 BLAKE2B 
f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d
 SHA512 
7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3
 DIST dmenu-5.3.tar.gz 16274 BLAKE2B 
fd76b0b11a153f98dd58ec20bc8a0ebc67f814cdf2d13a35ea3addcc3ad423bb9b2f4f73897cf6293e61a507900e7b7fec65e4f0acd15cc8e425f5506faa
 SHA512 
60f758134063ad7f304fbb0785c66dddc21461e5e5014f8735cf6d5c95dc22a177f069d48101e633ddffe5bbefc1118a2bf8b31daaf7b6438fdf6fe1bcb5d61c

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
deleted file mode 100644
index 9bc599cf5b83..
--- a/x11-misc/dmenu/dmenu-5.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-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 arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE="xinerama"
-
-RDEPEND="
-   media-libs/fontconfig
-   x11-libs/libX11
-   >=x11-libs/libXft-2.3.5
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-5.2-gentoo.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e 's|^ @|  |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 )" \
-   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
-   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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="${EPREFIX}/usr" install
-
-   save_config config.h
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-05-05 Thread Sam James

commit: 867a842942a145067fe95c393b393312744d2a1a
Author: Sam James  gentoo  org>
AuthorDate: Sun May  5 22:00:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  5 22:00:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867a8429

x11-misc/dmenu: Stabilize 5.3 arm64, #931263

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.3.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild
index 32db8837632d..ba847486ffc0 100644
--- a/x11-misc/dmenu/dmenu-5.3.ebuild
+++ b/x11-misc/dmenu/dmenu-5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-05-05 Thread Arthur Zamarin

commit: 10a413480138ba403b3db4f98f1edb0adc4aad49
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun May  5 19:50:46 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun May  5 19:50:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a41348

x11-misc/dmenu: Stabilize 5.3 ppc64, #931263

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/dmenu/dmenu-5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.3.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild
index 5c01c6321eee..32db8837632d 100644
--- a/x11-misc/dmenu/dmenu-5.3.ebuild
+++ b/x11-misc/dmenu/dmenu-5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-05-05 Thread Arthur Zamarin

commit: 884ab7cbecbc6ab0293cfddec27f5352d35b7339
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun May  5 19:50:43 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun May  5 19:50:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=884ab7cb

x11-misc/dmenu: Stabilize 5.3 ppc, #931263

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/dmenu/dmenu-5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.3.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild
index 15a6591b7d1c..5c01c6321eee 100644
--- a/x11-misc/dmenu/dmenu-5.3.ebuild
+++ b/x11-misc/dmenu/dmenu-5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-05-05 Thread Sam James

commit: 4617d1b5f8b64871471749ddb84227c885b60366
Author: Sam James  gentoo  org>
AuthorDate: Sun May  5 19:49:41 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  5 19:49:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4617d1b5

x11-misc/dmenu: Stabilize 5.3 amd64, #931263

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.3.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild
index 7d41a6f1d7f5..9033f97a31ae 100644
--- a/x11-misc/dmenu/dmenu-5.3.ebuild
+++ b/x11-misc/dmenu/dmenu-5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-05-05 Thread Sam James

commit: a4ea26a85b94094ea304e51a069b6ec90ec6264c
Author: Sam James  gentoo  org>
AuthorDate: Sun May  5 19:49:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  5 19:49:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ea26a8

x11-misc/dmenu: Stabilize 5.3 x86, #931263

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.3.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild
index 9033f97a31ae..15a6591b7d1c 100644
--- a/x11-misc/dmenu/dmenu-5.3.ebuild
+++ b/x11-misc/dmenu/dmenu-5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/files/

2024-04-18 Thread Conrad Kostecki

commit: 0e8dc088f23eb71562ea86371dc0eb17f6288d7f
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr 18 18:17:02 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Apr 18 19:31:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8dc088

x11-misc/dmenu: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-misc/dmenu/files/dmenu-4.9-gentoo.patch | 21 -
 1 file changed, 21 deletions(-)

diff --git a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
deleted file mode 100644
index 25fd34ab4579..
--- a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/config.mk
-+++ b/config.mk
-@@ -19,13 +19,13 @@
- #FREETYPEINC = $(X11INC)/freetype2
- 
- # includes and libs
--INCS = -I$(X11INC) -I$(FREETYPEINC)
--LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
-+INCS = $(X11INC) $(FREETYPEINC)
-+LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS)
- 
- # flags
--CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
--CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
--LDFLAGS  = $(LIBS)
-+CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
-+CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
-+LDFLAGS  += $(LIBS)
- 
- # compiler and linker
- CC = cc

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-03-28 Thread Conrad Kostecki

commit: 0c1060e82d1d270be4313af3cf8651b9c5f59a58
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Mar 28 14:07:42 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Mar 28 14:09:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1060e8

x11-misc/dmenu: update live ebuild

Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-misc/dmenu/dmenu-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index 49e950d0bb94..9fc2e0ca88da 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
@@ -10,13 +11,12 @@ EGIT_REPO_URI="https://git.suckless.org/dmenu";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="xinerama"
 
 RDEPEND="
media-libs/fontconfig
x11-libs/libX11
-   x11-libs/libXft
+   >=x11-libs/libXft-2.3.5
xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-4.9-gentoo.patch
+   "${FILESDIR}"/${PN}-5.2-gentoo.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-03-28 Thread Conrad Kostecki

commit: 58c01b37cc031c82279dd24387855381abb248d3
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Mar 28 14:03:56 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Mar 28 14:09:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c01b37

x11-misc/dmenu: add 5.3

Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-misc/dmenu/Manifest |  1 +
 x11-misc/dmenu/dmenu-5.3.ebuild | 62 +
 2 files changed, 63 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 8b77f6d19c65..153676f0aeb1 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1 +1,2 @@
 DIST dmenu-5.2.tar.gz 16196 BLAKE2B 
f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d
 SHA512 
7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3
+DIST dmenu-5.3.tar.gz 16274 BLAKE2B 
fd76b0b11a153f98dd58ec20bc8a0ebc67f814cdf2d13a35ea3addcc3ad423bb9b2f4f73897cf6293e61a507900e7b7fec65e4f0acd15cc8e425f5506faa
 SHA512 
60f758134063ad7f304fbb0785c66dddc21461e5e5014f8735cf6d5c95dc22a177f069d48101e633ddffe5bbefc1118a2bf8b31daaf7b6438fdf6fe1bcb5d61c

diff --git a/x11-misc/dmenu/dmenu-5.3.ebuild b/x11-misc/dmenu/dmenu-5.3.ebuild
new file mode 100644
index ..7d41a6f1d7f5
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+   media-libs/fontconfig
+   x11-libs/libX11
+   >=x11-libs/libXft-2.3.5
+   xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-gentoo.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e 's|^ @|  |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 )" \
+   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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="${EPREFIX}/usr" install
+
+   save_config config.h
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-03-28 Thread Conrad Kostecki

commit: dcbb606111c654e219f105330c7d1c4c438c43de
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Mar 28 14:03:33 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Mar 28 14:09:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbb6061

x11-misc/dmenu: drop 5.0, 5.1

Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-misc/dmenu/Manifest |  2 --
 x11-misc/dmenu/dmenu-5.0.ebuild | 62 -
 x11-misc/dmenu/dmenu-5.1.ebuild | 62 -
 3 files changed, 126 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 641869ae7333..8b77f6d19c65 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,3 +1 @@
-DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
-DIST dmenu-5.1.tar.gz 16096 BLAKE2B 
22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c
 SHA512 
2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453
 DIST dmenu-5.2.tar.gz 16196 BLAKE2B 
f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d
 SHA512 
7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
deleted file mode 100644
index a8602b9f9bb2..
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE="xinerama"
-
-RDEPEND="
-   media-libs/fontconfig
-   x11-libs/libX11
-   x11-libs/libXft
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.9-gentoo.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e 's|^ @|  |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 )" \
-   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
-   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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="${EPREFIX}/usr" install
-
-   save_config config.h
-}

diff --git a/x11-misc/dmenu/dmenu-5.1.ebuild b/x11-misc/dmenu/dmenu-5.1.ebuild
deleted file mode 100644
index 98db03cf8f38..
--- a/x11-misc/dmenu/dmenu-5.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="xinerama"
-
-RDEPEND="
-   media-libs/fontconfig
-   x11-libs/libX11
-   x11-libs/libXft
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.9-gentoo.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e 's|^ @|  |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 )" \
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2024-02-14 Thread Conrad Kostecki

commit: e48456a8867b1407035347d4d4204b15d964bef3
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Feb 14 20:25:24 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb 14 20:25:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48456a8

x11-misc/dmenu: take overship

Signed-off-by: Conrad Kostecki  gentoo.org>

 x11-misc/dmenu/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
index 115e9d64a669..c07e13d4a6bd 100644
--- a/x11-misc/dmenu/metadata.xml
+++ b/x11-misc/dmenu/metadata.xml
@@ -1,5 +1,8 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   conik...@gentoo.org
+   Conrad Kostecki
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2023-08-04 Thread Sam James

commit: f0aa499fa09aa3bbe73acdad243d68f5d7c12377
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug  4 09:18:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug  4 09:19:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aa499f

x11-misc/dmenu: Stabilize 5.2 ppc, #909807

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
index 4d082a30d72d..9bc599cf5b83 100644
--- a/x11-misc/dmenu/dmenu-5.2.ebuild
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2023-07-07 Thread Sam James

commit: 66daaa2c2d19942a7159a464256ad7f45839ccb8
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  8 03:38:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  8 03:38:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66daaa2c

x11-misc/dmenu: Stabilize 5.2 arm64, #909807

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
index 77c004cc86cb..4d082a30d72d 100644
--- a/x11-misc/dmenu/dmenu-5.2.ebuild
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2023-07-07 Thread Sam James

commit: b029d95e587be7ebdf4ec624922ee3c2afbe5949
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  7 10:14:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  7 10:14:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b029d95e

x11-misc/dmenu: Stabilize 5.2 x86, #909807

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
index 4b01fcf18d34..77c004cc86cb 100644
--- a/x11-misc/dmenu/dmenu-5.2.ebuild
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2023-07-06 Thread Sam James

commit: 0ebf76bd8c123f21867509c04afe4362165c9b07
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  7 04:40:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  7 04:40:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebf76bd

x11-misc/dmenu: Stabilize 5.2 amd64, #909807

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
index de7dd36d35cb..ab948045197b 100644
--- a/x11-misc/dmenu/dmenu-5.2.ebuild
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2023-07-06 Thread Sam James

commit: 5f12bf232806fc1d39b64b34534665c6b3bed389
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  7 04:40:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  7 04:40:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f12bf23

x11-misc/dmenu: Stabilize 5.2 ppc64, #909807

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
index ab948045197b..4b01fcf18d34 100644
--- a/x11-misc/dmenu/dmenu-5.2.ebuild
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2022-10-07 Thread Georgy Yakovlev

commit: ace80d35b2da72c1ff4189cb310bbd503228cc04
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Fri Oct  7 18:34:18 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Fri Oct  7 19:07:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace80d35

x11-misc/dmenu: add 5.2

Signed-off-by: Georgy Yakovlev  gentoo.org>

 x11-misc/dmenu/Manifest |  1 +
 x11-misc/dmenu/dmenu-5.2.ebuild | 62 +
 x11-misc/dmenu/files/dmenu-5.2-gentoo.patch | 26 
 3 files changed, 89 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 8b4995d4ede7..641869ae7333 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,2 +1,3 @@
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
 DIST dmenu-5.1.tar.gz 16096 BLAKE2B 
22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c
 SHA512 
2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453
+DIST dmenu-5.2.tar.gz 16196 BLAKE2B 
f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d
 SHA512 
7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
new file mode 100644
index ..de7dd36d35cb
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+   media-libs/fontconfig
+   x11-libs/libX11
+   >=x11-libs/libXft-2.3.5
+   xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.2-gentoo.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e 's|^ @|  |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 )" \
+   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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="${EPREFIX}/usr" install
+
+   save_config config.h
+}

diff --git a/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
new file mode 100644
index ..91ee6f353bda
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
@@ -0,0 +1,26 @@
+From 3c494e2289c93ab6262409f9498866bdfd57bcf4 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev 
+Date: Fri, 7 Oct 2022 11:29:04 -0700
+Subject: [PATCH] gentoo patch
+
+--- a/config.mk
 b/config.mk
+@@ -20,13 +20,13 @@ FREETYPEINC = /usr/include/freetype2
+ #MANPREFIX = ${PREFIX}/man
+ 
+ # includes and libs
+-INCS = -I$(X11INC) -I$(FREETYPEINC)
+-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
++INCS = $(X11INC) $(FREETYPEINC)
++LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS)
+ 
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS  = $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
++CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += $(LIBS)
+ 
+ # compiler and linker
+ CC = cc

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2022-03-16 Thread Sam James

commit: 0147e531558c2bf56d9b8a492a3278663d9316f5
Author: François-Xavier Carton  gmail  com>
AuthorDate: Tue Mar 15 17:57:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 16 17:06:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0147e531

x11-misc/dmenu: quote variables to allow CC containing spaces

Signed-off-by: François-Xavier Carton  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.0.ebuild  | 2 +-
 x11-misc/dmenu/dmenu-5.1.ebuild  | 2 +-
 x11-misc/dmenu/dmenu-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
index a6e9cace9bc6..a8602b9f9bb2 100644
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_compile() {
-   emake CC=$(tc-getCC) \
+   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 )" \
"X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \

diff --git a/x11-misc/dmenu/dmenu-5.1.ebuild b/x11-misc/dmenu/dmenu-5.1.ebuild
index c4cf69c227c4..98db03cf8f38 100644
--- a/x11-misc/dmenu/dmenu-5.1.ebuild
+++ b/x11-misc/dmenu/dmenu-5.1.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_compile() {
-   emake CC=$(tc-getCC) \
+   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 )" \
"X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index bcc3080b34a2..49e950d0bb94 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_compile() {
-   emake CC=$(tc-getCC) \
+   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 )" \
"X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2022-02-16 Thread Georgy Yakovlev

commit: 83779ab55287dd85f794d6777912cf1c51a3d310
Author: Zsolt Vadasz  protonmail  com>
AuthorDate: Tue Feb 15 13:30:53 2022 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Feb 16 21:20:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83779ab5

x11-misc/dmenu: Version bump (5.1)

Signed-off-by: Zsolt Vadasz  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24179
Signed-off-by: Georgy Yakovlev  gentoo.org>

 x11-misc/dmenu/Manifest |  1 +
 x11-misc/dmenu/dmenu-5.1.ebuild | 62 +
 2 files changed, 63 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 849feaa27122..8b4995d4ede7 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1 +1,2 @@
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
+DIST dmenu-5.1.tar.gz 16096 BLAKE2B 
22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c
 SHA512 
2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453

diff --git a/x11-misc/dmenu/dmenu-5.1.ebuild b/x11-misc/dmenu/dmenu-5.1.ebuild
new file mode 100644
index ..c4cf69c227c4
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+   media-libs/fontconfig
+   x11-libs/libX11
+   x11-libs/libXft
+   xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.9-gentoo.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e 's|^ @|  |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 )" \
+   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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="${EPREFIX}/usr" install
+
+   save_config config.h
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-09-21 Thread Yixun Lan

commit: d881c7e4e96fcf01014f749fa6df13d5d96b03bb
Author: Yongxiang Liang  gmail  com>
AuthorDate: Tue Sep 21 09:52:00 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Sep 21 13:40:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d881c7e4

x11-misc/dmenu: keyword ~riscv

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Yongxiang Liang  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 x11-misc/dmenu/dmenu-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
index 333d2fd7d51..a6e9cace9bc 100644
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2021-04-25 Thread Georgy Yakovlev

commit: 521ad220accf56a5dfea6f7dfaaa6242cc7d85e8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Apr 25 09:13:28 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Apr 25 09:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521ad220

x11-misc/dmenu: drop old

Bug: https://bugs.gentoo.org/722894
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev  gentoo.org>

 x11-misc/dmenu/Manifest |  2 -
 x11-misc/dmenu/dmenu-4.8.ebuild | 60 
 x11-misc/dmenu/dmenu-4.9.ebuild | 61 -
 x11-misc/dmenu/files/dmenu-4.7-gentoo.patch | 38 --
 4 files changed, 161 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index b5b7b6135f9..849feaa2712 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,3 +1 @@
-DIST dmenu-4.8.tar.gz 15658 BLAKE2B 
8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07
 SHA512 
fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
-DIST dmenu-4.9.tar.gz 15972 BLAKE2B 
56ba03a3dfd24e2fb0f45fec53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a
 SHA512 
c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
deleted file mode 100644
index 976b6840c2e..000
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 arm64 ~hppa ppc ppc64 x86"
-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="${EPREFIX}/usr" install
-
-   save_config config.h
-}

diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
deleted file mode 100644
index 29be48084ef..000
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-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.9-gentoo.patch
-)
-
-src_prepare() {
-   default
-
-   sed -i \
-   -e 's|^ @|  |g' \
-   -e '/^  echo/d' \
-   Makefile || die
-
-   restore_config config.h
-}
-
-src_compile() {
-   emake CC=$(tc-getCC) \
-   "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfi

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-04-23 Thread Sam James

commit: 9262326c8e118a298434cb47542d45ddfca062da
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 23 16:13:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 23 16:13:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9262326c

x11-misc/dmenu: Stabilize 5.0 x86, #783759

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
index f864b26afa0..8c7565cf707 100644
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-04-22 Thread Sam James

commit: ad8490ca0ffd573d2945442731e897a274d050da
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 20:12:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 20:12:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8490ca

x11-misc/dmenu: Stabilize 5.0 amd64, #783759

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
index d46b2394987..f864b26afa0 100644
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-04-22 Thread Sam James

commit: 60500153464e51d59aa93ae24c3feef1b9e0736c
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 12:20:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 12:22:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60500153

x11-misc/dmenu: Stabilize 5.0 arm64, #783759

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
index a3eeb8bcd1b..d46b2394987 100644
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ppc ppc64 ~x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-04-22 Thread Sam James

commit: 8e11016db09ee0c4749230a79f29c4d6f83c31e2
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 12:16:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 12:17:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e11016d

x11-misc/dmenu: Stabilize 5.0 ppc, #783759

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
index bccd963a25a..a3eeb8bcd1b 100644
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2021-04-19 Thread Sam James

commit: cde3d26b770ff8626ca582a04f28fde23e88bb56
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:49:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:49:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde3d26b

x11-misc/dmenu: drop 4.6 (epatch)

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/Manifest |  1 -
 x11-misc/dmenu/dmenu-4.6.ebuild | 55 -
 x11-misc/dmenu/files/dmenu-4.6-gentoo.patch | 38 
 3 files changed, 94 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 85b473475b8..b5b7b6135f9 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,4 +1,3 @@
-DIST dmenu-4.6.tar.gz 15057 BLAKE2B 
87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495
 SHA512 
e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 
8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07
 SHA512 
fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 
56ba03a3dfd24e2fb0f45fec53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a
 SHA512 
c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
deleted file mode 100644
index 3105af4cd56..000
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch 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"
-IUSE="xinerama"
-
-RDEPEND="
-   media-libs/fontconfig
-   x11-libs/libX11
-   x11-libs/libXft
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   x11-base/xorg-proto
-"
-
-src_prepare() {
-   sed -i \
-   -e 's|^ @|  |g' \
-   -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-   -e '/^  echo/d' \
-   Makefile || die
-
-   epatch "${FILESDIR}"/${PN}-4.6-gentoo.patch
-
-   epatch_user
-}
-
-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/files/dmenu-4.6-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
deleted file mode 100644
index 0d826e0d5a9..000
--- a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 a/config.mk
-+++ b/config.mk
-@@ -5,8 +5,8 @@
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = -I/usr/X11R6/include
-+X11LIB = -L/usr/X11R6/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -14,18 +14,18 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = -I/usr/include/freetype2
- # OpenBSD (uncomment)
- FREETYPEINC = ${X11INC}/freetype2
- 
- # includes and libs
--INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+INCS = ${X11INC} ${FREETYPEINC}
-+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
- 
- # flags
--CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS  = -s ${LIBS}
-+CPPFLA

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-04-17 Thread Sam James

commit: 00ba2ab482ceb7a5caba6a3b2b72fd5d5f64bff0
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 14:06:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 18 06:05:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ba2ab4

x11-misc/dmenu: eutils->epatch

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-4.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index f35a5bae308..3105af4cd56 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
 HOMEPAGE="https://tools.suckless.org/dmenu/";

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-02-27 Thread Sam James

commit: 0ef338103dd0d27e6562e2ee4d4de2bad8dac60c
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 27 12:30:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 27 12:30:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef33810

x11-misc/dmenu: Stabilize 4.8 ppc64, #773142

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 3bb52a7f6a0..976b6840c2e 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2021-02-27 Thread Sam James

commit: 4fc6ae8dca19306903ca884e2c85891f6caa012f
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 27 10:43:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 27 10:43:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc6ae8d

x11-misc/dmenu: Stabilize 4.8 ppc, #773142

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/dmenu-4.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index e577a44a68f..3bb52a7f6a0 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2020-11-03 Thread Georgy Yakovlev

commit: 692e190f86185362ef9e80daf62f5d9295d612cc
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Nov  3 21:47:32 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Nov  3 21:54:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692e190f

x11-misc/dmenu: update metadata.xml

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 x11-misc/dmenu/metadata.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
index bc1b97e1eb7..efcd58fe0b9 100644
--- a/x11-misc/dmenu/metadata.xml
+++ b/x11-misc/dmenu/metadata.xml
@@ -1,8 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-  
-desktop-m...@gentoo.org
-Gentoo Desktop Miscellaneous Project
-  
+   
+   gyakov...@gentoo.org
+   Georgy Yakovlev
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2020-09-02 Thread Jeroen Roovers

commit: 8dd6dc3de140b4d72592b40590bce7c6ed56c083
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Sep  2 17:17:07 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Sep  2 17:17:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd6dc3d

x11-misc/dmenu: Version 5.0

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/Manifest |  1 +
 x11-misc/dmenu/dmenu-5.0.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 99bfcb51fc2..85b473475b8 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,3 +1,4 @@
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 
87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495
 SHA512 
e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 
8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07
 SHA512 
fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 
56ba03a3dfd24e2fb0f45fec53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a
 SHA512 
c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
+DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3

diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
new file mode 100644
index 000..49610645344
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+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.9-gentoo.patch
+)
+
+src_prepare() {
+   default
+
+   sed -i \
+   -e 's|^ @|  |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 )" \
+   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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="${EPREFIX}/usr" install
+
+   save_config config.h
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/files/

2020-01-10 Thread Jeroen Roovers

commit: 94c673973ab7a944154e74014f1d9fc851c5da2b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jan 10 11:44:08 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jan 10 11:45:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c67397

x11-misc/dmenu: Drop unused patch

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/files/dmenu--gentoo.patch | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/x11-misc/dmenu/files/dmenu--gentoo.patch 
b/x11-misc/dmenu/files/dmenu--gentoo.patch
deleted file mode 100644
index c22e9b78fe0..000
--- a/x11-misc/dmenu/files/dmenu--gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 a/config.mk
-+++ b/config.mk
-@@ -23,9 +23,9 @@
- LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
- 
- # flags
--CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
--CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
--LDFLAGS  = $(LIBS)
-+CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
-+CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
-+LDFLAGS  += $(LIBS)
- 
- # compiler and linker
- CC = cc

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2019-06-03 Thread Jeroen Roovers

commit: 6da5ea9769819d66b2d32e8c85ffdd28e6a2609b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jun  3 09:42:53 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jun  3 09:43:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da5ea97

x11-misc/dmenu: Mark ~arm64 too

Package-Manager: Portage-2.3.67, Repoman-2.3.13
RepoMan-Options: --ignore-arches
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/dmenu-4.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index dafe23ddeda..c8171c859d8 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2019-04-23 Thread Aaron Bauman

commit: cfb472f24ce395c648222ee754a3929baaeb9c8f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Apr 23 16:51:49 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Apr 23 16:52:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb472f2

x11-misc/dmenu: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 x11-misc/dmenu/dmenu-4.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index aaf42bf59d9..916ea5565a5 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2019-03-15 Thread Jeroen Roovers

commit: 524deaa55c22ed4c235d8027267a0a00469593da
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Mar 15 13:26:23 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Mar 15 13:26:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524deaa5

x11-misc/dmenu: Update live ebuild

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/dmenu-4.9.ebuild  |  1 -
 x11-misc/dmenu/dmenu-.ebuild | 24 +---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index 9fe6efe1753..dafe23ddeda 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -32,7 +32,6 @@ src_prepare() {
 
sed -i \
-e 's|^ @|  |g' \
-   -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-e '/^  echo/d' \
Makefile || die
 

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index 8001b06f1d6..ac2f60df320 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
@@ -32,7 +32,6 @@ src_prepare() {
 
sed -i \
-e 's|^ @|  |g' \
-   -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-e '/^  echo/d' \
Makefile || die
 
@@ -41,15 +40,18 @@ src_prepare() {
 
 src_compile() {
emake CC=$(tc-getCC) \
-   INCS=" \
-   $(usex xinerama "-DXINERAMA" '') \
-   $(
-   $(tc-getPKG_CONFIG) --cflags fontconfig 
freetype2 x11 xft $(usex xinerama xinerama '')
-   )" \
-   LIBS=" \
-   $(
-   $(tc-getPKG_CONFIG) --libs fontconfig x11 xft 
$(usex xinerama xinerama '')
-   )"
+   "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 
2>/dev/null )" \
+   "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 
2>/dev/null )" \
+   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2019-02-07 Thread Jeroen Roovers

commit: 412900288e16795e9d6765b186b43df68810ff28
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Feb  7 09:20:28 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Feb  7 09:21:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41290028

x11-misc/dmenu: Fix includes

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/677324
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/dmenu-4.9.ebuild |  2 ++
 x11-misc/dmenu/files/dmenu-4.9-gentoo.patch | 10 --
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index 022c42ba3dc..9fe6efe1753 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -43,6 +43,8 @@ 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 )" \
+   "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+   "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \
"XINERAMAFLAGS=$(
usex xinerama "-DXINERAMA $(
$(tc-getPKG_CONFIG) --cflags xinerama 
2>/dev/null

diff --git a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
index ee2ce0b9c15..25fd34ab457 100644
--- a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
@@ -1,7 +1,13 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -23,9 +23,9 @@
- LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+@@ -19,13 +19,13 @@
+ #FREETYPEINC = $(X11INC)/freetype2
+ 
+ # includes and libs
+-INCS = -I$(X11INC) -I$(FREETYPEINC)
+-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
++INCS = $(X11INC) $(FREETYPEINC)
++LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS)
  
  # flags
 -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/files/, x11-misc/dmenu/

2019-02-05 Thread Jeroen Roovers

commit: 424d347633450bf1c07d1043d96958b6ba2be458
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Feb  5 15:15:49 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Feb  5 15:16:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424d3476

x11-misc/dmenu: Version 4.9

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/Manifest |  1 +
 x11-misc/dmenu/dmenu-4.9.ebuild | 60 +
 x11-misc/dmenu/files/dmenu-4.9-gentoo.patch | 15 
 3 files changed, 76 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 3ab401367f4..99bfcb51fc2 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,2 +1,3 @@
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 
87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495
 SHA512 
e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 
8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07
 SHA512 
fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
+DIST dmenu-4.9.tar.gz 15972 BLAKE2B 
56ba03a3dfd24e2fb0f45fec53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a
 SHA512 
c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65

diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
new file mode 100644
index 000..022c42ba3dc
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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.9-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="${EPREFIX}/usr" install
+
+   save_config config.h
+}

diff --git a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
new file mode 100644
index 000..ee2ce0b9c15
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
@@ -0,0 +1,15 @@
+--- a/config.mk
 b/config.mk
+@@ -23,9 +23,9 @@
+ LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
+ 
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS  = $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
++CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += $(LIBS)
+ 
+ # compiler and linker
+ CC = cc

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2019-01-17 Thread Jeroen Roovers

commit: 036096f8fd1828f8143a76366d80f3decabd338e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jan 18 07:55:23 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jan 18 07:56:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036096f8

x11-misc/dmenu: Old

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/Manifest|  1 -
 x11-misc/dmenu/dmenu-4.7-r1.ebuild | 60 --
 2 files changed, 61 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 7686dd5d68f..3ab401367f4 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,3 +1,2 @@
 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

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 1bf43050b79..000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2019-01-17 Thread Jeroen Roovers

commit: 46959d1072b4b5ecdf7d6c87e37fb38aba280004
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Jan 18 07:52:15 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Jan 18 07:54:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46959d10

x11-misc/dmenu: Fix PREFIX support

Fixes:  https://bugs.gentoo.org/675750
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Susan Wilson  airmail.cc>
Signed-off-by: Jeroen Roovers  gentoo.org>

 x11-misc/dmenu/dmenu-4.8.ebuild  | 4 ++--
 x11-misc/dmenu/dmenu-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 7d0c6c78aff..aaf42bf59d9 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-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index fc4d6bc..8001b06f1d6 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.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
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2018-09-23 Thread Jeroen Roovers

commit: 30fa71f9d0eb6b0bbd61dd82d8f9dba2b13ce597
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Sep 23 19:22:26 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Sep 23 20:45:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fa71f9

x11-misc/dmenu: Stable for AMD64 HPPA x86 too.

Package-Manager: Portage-2.3.49, Repoman-2.3.11
RepoMan-Options: --ignore-arches

 x11-misc/dmenu/dmenu-4.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index 1bf43050b79..7d0c6c78aff 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 Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/files/

2018-06-19 Thread Jeroen Roovers

commit: fab829b563fcf405fdc8b6db1e35f96b4aac7602
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jun 19 11:16:13 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jun 19 11:16:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab829b5

x11-misc/dmenu: Update live ebuild patch.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/dmenu/files/dmenu--gentoo.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/files/dmenu--gentoo.patch 
b/x11-misc/dmenu/files/dmenu--gentoo.patch
index 75a1f89415e..c22e9b78fe0 100644
--- a/x11-misc/dmenu/files/dmenu--gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu--gentoo.patch
@@ -6,7 +6,7 @@
  # flags
 -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
 -CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
--LDFLAGS  = -s $(LIBS)
+-LDFLAGS  = $(LIBS)
 +CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
 +CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
 +LDFLAGS  += $(LIBS)

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2018-04-28 Thread Jeroen Roovers

commit: 4012abe8b06da80e146bacd1ccbfec0af1a255cb
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Apr 28 12:14:04 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Apr 28 12:14:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4012abe8

x11-misc/dmenu: Fix patch, rework src_compile().

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 x11-misc/dmenu/dmenu-.ebuild | 21 ---
 x11-misc/dmenu/files/dmenu--gentoo.patch | 38 ++--
 2 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index e55ea229223..5cb15906696 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,16 +42,15 @@ src_prepare() {
 
 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)" ''
-   )"
+   INCS=" \
+   $(usex xinerama "-DXINERAMA" '') \
+   $(
+   $(tc-getPKG_CONFIG) --cflags fontconfig 
freetype2 x11 xft $(usex xinerama xinerama '')
+   )" \
+   LIBS=" \
+   $(
+   $(tc-getPKG_CONFIG) --libs fontconfig x11 xft 
$(usex xinerama xinerama '')
+   )"
 }
 
 src_install() {

diff --git a/x11-misc/dmenu/files/dmenu--gentoo.patch 
b/x11-misc/dmenu/files/dmenu--gentoo.patch
index faeed310c88..75a1f89415e 100644
--- a/x11-misc/dmenu/files/dmenu--gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu--gentoo.patch
@@ -1,37 +1,15 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -5,8 +5,8 @@
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = -I/usr/X11R6/include
-+X11LIB = -L/usr/X11R6/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -14,18 +14,18 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = -I/usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- 
- # includes and libs
--INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+INCS = ${X11INC} ${FREETYPEINC}
-+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+@@ -23,9 +23,9 @@
+ LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
  
  # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS  = -s ${LIBS}
-+CFLAGS   = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS  = ${LIBS}
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS  = -s $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
++CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += $(LIBS)
  
  # compiler and linker
  CC = cc

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2018-03-16 Thread Jeroen Roovers

commit: b1618ac68b7583d87e2654c4ab213d99e7f38092
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Mar 16 15:13:27 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Mar 16 15:13:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1618ac6

x11-misc/dmenu: Versions 4.8 manifest.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-misc/dmenu/Manifest |  1 +
 x11-misc/dmenu/dmenu-4.8.ebuild | 61 +
 2 files changed, 62 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 1b838b33736..7686dd5d68f 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
new file mode 100644
index 000..8740afefa1f
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -0,0 +1,61 @@
+# 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
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2017-10-30 Thread Jeroen Roovers

commit: 50131048b8e8bcd9f9129b78deae94db486aa6b1
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Oct 31 04:59:30 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Oct 31 04:59:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50131048

x11-misc/dmenu: Fix savedconfig support in live ebuild by Hadrien Lacour (bug 
#635820).

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-misc/dmenu/dmenu-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index ebd674d6232..e55ea229223 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.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
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2017-10-30 Thread Jeroen Roovers

commit: e2dc58720ac8be82138b1e4d682399edf9d49ff7
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Oct 30 15:52:43 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Oct 30 15:53:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2dc5872

x11-misc/dmenu: Add savedconfig support by Hadrien Lacour (bug #635820).

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-misc/dmenu/{dmenu-4.7.ebuild => dmenu-4.7-r1.ebuild} | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-4.7.ebuild 
b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
similarity index 93%
rename from x11-misc/dmenu/dmenu-4.7.ebuild
rename to x11-misc/dmenu/dmenu-4.7-r1.ebuild
index 47042fad0e7..05dc375cb2b 100644
--- a/x11-misc/dmenu/dmenu-4.7.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
 HOMEPAGE="https://tools.suckless.org/dmenu/";
@@ -36,6 +36,8 @@ src_prepare() {
-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-e '/^  echo/d' \
Makefile || die
+
+   restore_config config.h
 }
 
 src_compile() {
@@ -54,4 +56,6 @@ src_compile() {
 
 src_install() {
emake DESTDIR="${D}" PREFIX="/usr" install
+
+   save_config config.h
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2017-09-10 Thread Jeroen Roovers

commit: 6c4850ebf7699dd8342da510fe93e667ad051592
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Sep 10 21:44:17 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Sep 10 21:46:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4850eb

x11-misc/dmenu: Use HTTPS.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-misc/dmenu/dmenu-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index 9e869161279..ebd674d6232 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -6,7 +6,7 @@ inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
 HOMEPAGE="https://tools.suckless.org/dmenu/";
-EGIT_REPO_URI="git://git.suckless.org/dmenu"
+EGIT_REPO_URI="https://git.suckless.org/dmenu";
 
 LICENSE="MIT"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2017-08-31 Thread Jeroen Roovers

commit: 1dd3a3d7552c3929ac13eb6f5b38308012f67123
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Aug 31 10:05:34 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Aug 31 10:05:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd3a3d7

x11-misc/dmenu: Switch to HTTPS.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-misc/dmenu/dmenu-4.6.ebuild  | 6 +++---
 x11-misc/dmenu/dmenu-4.7.ebuild  | 4 ++--
 x11-misc/dmenu/dmenu-.ebuild | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index 121c77abecb..dbf358fff49 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
-HOMEPAGE="http://tools.suckless.org/dmenu/";
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
+HOMEPAGE="https://tools.suckless.org/dmenu/";
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/x11-misc/dmenu/dmenu-4.7.ebuild b/x11-misc/dmenu/dmenu-4.7.ebuild
index 619f585174c..47042fad0e7 100644
--- a/x11-misc/dmenu/dmenu-4.7.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
-HOMEPAGE="http://tools.suckless.org/dmenu/";
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
+HOMEPAGE="https://tools.suckless.org/dmenu/";
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index 740dcacd311..9e869161279 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
-HOMEPAGE="http://tools.suckless.org/dmenu/";
+HOMEPAGE="https://tools.suckless.org/dmenu/";
 EGIT_REPO_URI="git://git.suckless.org/dmenu"
 
 LICENSE="MIT"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/files/, x11-misc/dmenu/

2017-05-05 Thread Jeroen Roovers

commit: 60ec67a1bc5d7fdb664d1f3d2a1902ce08868a33
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri May  5 12:29:45 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri May  5 12:29:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ec67a1

x11-misc/dmenu: Version bump.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-misc/dmenu/Manifest|  1 +
 .../dmenu/{dmenu-.ebuild => dmenu-4.7.ebuild}  | 21 +---
 x11-misc/dmenu/dmenu-.ebuild   | 13 
 x11-misc/dmenu/files/dmenu-4.7-gentoo.patch| 38 ++
 4 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index f6485f05c0a..adb43f91f2a 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1 +1,2 @@
 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

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-4.7.ebuild
similarity index 80%
copy from x11-misc/dmenu/dmenu-.ebuild
copy to x11-misc/dmenu/dmenu-4.7.ebuild
index e94945351f0..619f585174c 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils git-r3 savedconfig toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
 HOMEPAGE="http://tools.suckless.org/dmenu/";
-EGIT_REPO_URI="git://git.suckless.org/dmenu"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="
@@ -24,19 +24,18 @@ DEPEND="${RDEPEND}
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
-
-   epatch "${FILESDIR}"/${P}-gentoo.patch
-
-   eapply_user
-
-   restore_config config.def.h
 }
 
 src_compile() {
@@ -55,6 +54,4 @@ src_compile() {
 
 src_install() {
emake DESTDIR="${D}" PREFIX="/usr" install
-
-   save_config config.def.h
 }

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index e94945351f0..740dcacd311 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils git-r3 savedconfig toolchain-funcs
+inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
 HOMEPAGE="http://tools.suckless.org/dmenu/";
@@ -24,18 +24,19 @@ DEPEND="${RDEPEND}
xinerama? ( x11-proto/xineramaproto )
x11-proto/xproto
 "
+PATCHES=(
+   "${FILESDIR}"/${P}-gentoo.patch
+)
 
 src_prepare() {
+   default
+
sed -i \
-e 's|^ @|  |g' \
-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-e '/^  echo/d' \
Makefile || die
 
-   epatch "${FILESDIR}"/${P}-gentoo.patch
-
-   eapply_user
-
restore_config config.def.h
 }
 

diff --git a/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch
new file mode 100644
index 000..77f59415588
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch
@@ -0,0 +1,38 @@
+--- a/config.mk
 b/config.mk
+@@ -5,8 +5,8 @@
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = -I/usr/X11R6/include
++X11LIB = -L/usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS  = -lXinerama
+@@ -14,18 +14,18 @@
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-FREETYPEINC = /usr/include/freetype2
++FREETYPEINC = -I/usr/include/f

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2016-03-25 Thread Patrick Lauer

commit: f1c5d825e62c0c4514e30fd41e9ddef368961c7a
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Mar 25 09:01:16 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Fri Mar 25 09:01:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c5d825

x11-misc/dmenu: Remove unneeded useflag description from metadata.xml

Package-Manager: portage-2.2.28

 x11-misc/dmenu/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
index f1f09f9..b4a38aa 100644
--- a/x11-misc/dmenu/metadata.xml
+++ b/x11-misc/dmenu/metadata.xml
@@ -8,7 +8,4 @@
 desktop-m...@gentoo.org
 Gentoo Desktop Miscellaneous Project
   
-  
-  Enable unofficial x11-libs/libXft support
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2016-03-24 Thread Jeroen Roovers

commit: 8d4cc21efb4dc380cf0327d6df513bdf36066dda
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Mar 25 03:16:13 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Mar 25 03:16:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4cc21e

x11-misc/dmenu: Old.

Package-Manager: portage-2.2.28

 x11-misc/dmenu/Manifest|   1 -
 x11-misc/dmenu/dmenu-4.5-r3.ebuild |  59 -
 x11-misc/dmenu/dmenu-4.5-r4.ebuild |  59 -
 x11-misc/dmenu/files/dmenu-4.5-xft-2.patch | 410 
 x11-misc/dmenu/files/dmenu-4.5-xft-3.patch | 412 -
 5 files changed, 941 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 37adb31..f6485f0 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,2 +1 @@
-DIST dmenu-4.5.tar.gz 11543 SHA256 
082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 
872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248
 WHIRLPOOL 
b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869
 DIST dmenu-4.6.tar.gz 15057 SHA256 
4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 
e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 WHIRLPOOL 
b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d

diff --git a/x11-misc/dmenu/dmenu-4.5-r3.ebuild 
b/x11-misc/dmenu/dmenu-4.5-r3.ebuild
deleted file mode 100644
index 2b20972..000
--- a/x11-misc/dmenu/dmenu-4.5-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
-HOMEPAGE="http://tools.suckless.org/dmenu/";
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="xft xinerama"
-
-RDEPEND="
-   x11-libs/libX11
-   xft? ( x11-libs/libXft )
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   xft? ( virtual/pkgconfig )
-   xinerama? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-   # Respect our flags
-   sed -i \
-   -e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) 
$(CPPFLAGS)|}' \
-   -e '/^LDFLAGS/s|= -s|+=|' \
-   config.mk || die
-   # Make make verbose
-   sed -i \
-   -e 's|^ @|  |g' \
-   -e '/^  echo/d' \
-   Makefile || die
-   use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-2.patch
-
-   epatch_user
-}
-
-src_compile() {
-   emake CC=$(tc-getCC) \
-   "XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \
-   "XFTLIBS=$( $(tc-getPKG_CONFIG) --libs 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-4.5-r4.ebuild 
b/x11-misc/dmenu/dmenu-4.5-r4.ebuild
deleted file mode 100644
index 7844730..000
--- a/x11-misc/dmenu/dmenu-4.5-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
-HOMEPAGE="http://tools.suckless.org/dmenu/";
-SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="xft xinerama"
-
-RDEPEND="
-   x11-libs/libX11
-   xft? ( x11-libs/libXft )
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   xft? ( virtual/pkgconfig )
-   xinerama? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-   # Respect our flags
-   sed -i \
-   -e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) 
$(CPPFLAGS)|}' \
-   -e '/^LDFLAGS/s|= -s|+=|' \
-   config.mk || die
-   # Make make verbose
-   sed -i \
-   -e 's|^ @|  |g' \
-   -e '/^  echo/d' \
-   Makefile || die
-   use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-3.patch
-
-   epatch_user
-}
-
-src_compile() {
-   emake CC=$(tc-getCC)

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2016-03-24 Thread Jeroen Roovers

commit: f14e66f41b9251e1c59f7f322d6fa59ee28004f8
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Mar 25 03:14:55 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Mar 25 03:16:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14e66f4

x11-misc/dmenu: Stable for HPPA (bug #576066).

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 x11-misc/dmenu/dmenu-4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index d76b496..c154603 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2016-02-29 Thread Jeroen Roovers

commit: 4a7dab58101e17754ab76cbe6c8e1a399ca4ca75
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Mar  1 04:15:08 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Mar  1 04:15:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7dab58

x11-misc/dmenu: Tweak Gentoo patch.

Package-Manager: portage-2.2.27

 x11-misc/dmenu/dmenu-.ebuild | 4 +++-
 x11-misc/dmenu/files/dmenu--gentoo.patch | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index 65eabbb..79a2f8b 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit eutils git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
@@ -35,6 +35,8 @@ src_prepare() {
 
epatch "${FILESDIR}"/${P}-gentoo.patch
 
+   eapply_user
+
restore_config config.def.h
 }
 

diff --git a/x11-misc/dmenu/files/dmenu--gentoo.patch 
b/x11-misc/dmenu/files/dmenu--gentoo.patch
index b6940d1..faeed31 100644
--- a/x11-misc/dmenu/files/dmenu--gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu--gentoo.patch
@@ -27,7 +27,7 @@
 +LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
  
  # flags
- CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 -CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS  = -s ${LIBS}
 +CFLAGS   = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2016-01-09 Thread Markus Meier

commit: 30205903382dc4699372bd2526bb7715055e5f09
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Jan  9 18:51:42 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Jan  9 18:51:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30205903

x11-misc/dmenu: add ~arm, bug #570394

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"

 x11-misc/dmenu/dmenu-4.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index 29e7639..5f3a4ff 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/

2015-11-11 Thread Jeroen Roovers

commit: 4bfb3cc22ec737d0e7245f553a43ac0f3de98a1b
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Nov 12 06:22:58 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Nov 12 06:22:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfb3cc2

x11-misc/dmenu: Re-add USE=savedconfig by Balint SZENTE (bug #565530).

Package-Manager: portage-2.2.24

 x11-misc/dmenu/dmenu-.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index f5f8bf6..65eabbb 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils git-r3 toolchain-funcs
+inherit eutils git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
 HOMEPAGE="http://tools.suckless.org/dmenu/";
@@ -35,7 +35,7 @@ src_prepare() {
 
epatch "${FILESDIR}"/${P}-gentoo.patch
 
-   epatch_user
+   restore_config config.def.h
 }
 
 src_compile() {
@@ -54,4 +54,6 @@ src_compile() {
 
 src_install() {
emake DESTDIR="${D}" PREFIX="/usr" install
+
+   save_config config.def.h
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2015-11-08 Thread Jeroen Roovers

commit: 6e50d6f4430dc175f0e151891f5951d1322c2b5e
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Nov  9 06:11:58 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Nov  9 06:12:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e50d6f4

x11-misc/dmenu: Update live ebuild.

Package-Manager: portage-2.2.24

 x11-misc/dmenu/dmenu-.ebuild | 35 +++---
 x11-misc/dmenu/files/dmenu--gentoo.patch | 37 
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-.ebuild b/x11-misc/dmenu/dmenu-.ebuild
index fcb7bf4..f5f8bf6 100644
--- a/x11-misc/dmenu/dmenu-.ebuild
+++ b/x11-misc/dmenu/dmenu-.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils git-r3 savedconfig toolchain-funcs
+inherit eutils git-r3 toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
 HOMEPAGE="http://tools.suckless.org/dmenu/";
@@ -15,50 +15,43 @@ KEYWORDS=""
 IUSE="xinerama"
 
 RDEPEND="
+   media-libs/fontconfig
x11-libs/libX11
+   x11-libs/libXft
xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
-   xinerama? ( virtual/pkgconfig )
+   virtual/pkgconfig
+   xinerama? ( x11-proto/xineramaproto )
+   x11-proto/xproto
 "
 
 src_prepare() {
-   # Respect our flags
-   sed -i \
-   -e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) 
$(CPPFLAGS)|}' \
-   -e '/^LDFLAGS/s|= -s|+=|' \
-   config.mk || die
-   # Make make verbose
sed -i \
-e 's|^ @|  |g' \
+   -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-e '/^  echo/d' \
Makefile || die
 
-   restore_config config.def.h
-   epatch_user
-}
+   epatch "${FILESDIR}"/${P}-gentoo.patch
 
-src_configure() {
-   tc-export PKG_CONFIG
+   epatch_user
 }
 
 src_compile() {
-   emake \
-   CC=$(tc-getCC) \
+   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 $(
-   ${PKG_CONFIG} --cflags xinerama 2>/dev/null
+   $(tc-getPKG_CONFIG) --cflags xinerama 
2>/dev/null
)" ''
)" \
"XINERAMALIBS=$(
-   usex xinerama "$(
-   ${PKG_CONFIG} --libs xinerama 2>/dev/null
-   )" ''
+   usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 
2>/dev/null)" ''
)"
 }
 
 src_install() {
emake DESTDIR="${D}" PREFIX="/usr" install
-
-   save_config config.def.h
 }

diff --git a/x11-misc/dmenu/files/dmenu--gentoo.patch 
b/x11-misc/dmenu/files/dmenu--gentoo.patch
new file mode 100644
index 000..b6940d1
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu--gentoo.patch
@@ -0,0 +1,37 @@
+--- a/config.mk
 b/config.mk
+@@ -5,8 +5,8 @@
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = -I/usr/X11R6/include
++X11LIB = -L/usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS  = -lXinerama
+@@ -14,18 +14,18 @@
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-FREETYPEINC = /usr/include/freetype2
++FREETYPEINC = -I/usr/include/freetype2
+ # OpenBSD (uncomment)
+ #FREETYPEINC = ${X11INC}/freetype2
+ 
+ # includes and libs
+-INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++INCS = ${X11INC} ${FREETYPEINC}
++LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+ 
+ # flags
+ CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS  = -s ${LIBS}
++CFLAGS   = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS  = ${LIBS}
+ 
+ # compiler and linker
+ CC = cc

[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/files/, x11-misc/dmenu/

2015-11-08 Thread Jeroen Roovers

commit: 3901425436242cb38dee98c47e3d3f2d983dcb6d
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Nov  9 06:01:12 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Nov  9 06:12:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39014254

x11-misc/dmenu: Version bump.

Package-Manager: portage-2.2.24

 x11-misc/dmenu/Manifest |  1 +
 x11-misc/dmenu/dmenu-4.6.ebuild | 57 +
 x11-misc/dmenu/files/dmenu-4.6-gentoo.patch | 38 +++
 3 files changed, 96 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index a1177f5..37adb31 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1 +1,2 @@
 DIST dmenu-4.5.tar.gz 11543 SHA256 
082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 
872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248
 WHIRLPOOL 
b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869
+DIST dmenu-4.6.tar.gz 15057 SHA256 
4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 
e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 WHIRLPOOL 
b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
new file mode 100644
index 000..29e7639
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
+HOMEPAGE="http://tools.suckless.org/dmenu/";
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+"
+
+src_prepare() {
+   sed -i \
+   -e 's|^ @|  |g' \
+   -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
+   -e '/^  echo/d' \
+   Makefile || die
+
+   epatch "${FILESDIR}"/${PN}-4.6-gentoo.patch
+
+   epatch_user
+}
+
+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/files/dmenu-4.6-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
new file mode 100644
index 000..0d826e0
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
@@ -0,0 +1,38 @@
+--- a/config.mk
 b/config.mk
+@@ -5,8 +5,8 @@
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = -I/usr/X11R6/include
++X11LIB = -L/usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS  = -lXinerama
+@@ -14,18 +14,18 @@
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-FREETYPEINC = /usr/include/freetype2
++FREETYPEINC = -I/usr/include/freetype2
+ # OpenBSD (uncomment)
+ FREETYPEINC = ${X11INC}/freetype2
+ 
+ # includes and libs
+-INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++INCS = ${X11INC} ${FREETYPEINC}
++LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+ 
+ # flags
+-CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS  = -s ${LIBS}
++CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CFLAGS   += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += ${LIBS}
+ 
+ # compiler and linker
+ CC = cc

56 matches

Mail list logo