[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/, 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 fontconfig

[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}

[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/, 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/, 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/, 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/, 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