Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/openbox-menu/files/, x11-misc/openbox-menu/
Date: Sat, 01 May 2021 21:24:20
Message-Id: 1619904114.b434d5b14023d0c204c72d9276c997fa7d8fe316.asturm@gentoo
1 commit: b434d5b14023d0c204c72d9276c997fa7d8fe316
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 1 21:12:09 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 21:21:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b434d5b1
7
8 x11-misc/openbox-menu: Drop 0.8.0, EAPI5--
9
10 Closes: https://bugs.gentoo.org/698100
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 x11-misc/openbox-menu/Manifest | 1 -
15 .../files/openbox-menu-0.5.0-build.patch | 81 ----------------------
16 x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild | 42 -----------
17 3 files changed, 124 deletions(-)
18
19 diff --git a/x11-misc/openbox-menu/Manifest b/x11-misc/openbox-menu/Manifest
20 index bfff046437b..64735ae9fe9 100644
21 --- a/x11-misc/openbox-menu/Manifest
22 +++ b/x11-misc/openbox-menu/Manifest
23 @@ -1,2 +1 @@
24 -DIST openbox-menu-0.8.0.tar.bz2 24229 BLAKE2B 8950d1bf55454f239a92cf17f8676295f7c769b73fce34ee2786b0a5dd18bd81b3dddfec7f5fcf77f697072abaea758d1d5c9d0f80d41c0a9d80709b845161c2 SHA512 955a5e16e7be001aec030358d3568aa6a3303d7138d6eb998494cd9ffa77de14ecf4bee163a9d49faf67939c85e303cbae51461f04f7eeaf44167a377c0f352d
25 DIST openbox-menu-0.8.1.tar.gz 27960 BLAKE2B f4c78956c163b0d8ca2d601b05354217071e93307a0abc1536d1d373a3d402384b0a4d3c15252aaf9aae7c20b76b5b8aa69edfacbe11cfaa76b1aba8a7a4834e SHA512 de6454e88ac30b5cb1094ae427116808ad9dd2f37c8d2ae20dea77aa60d414a47149c09e8ea7d3c5c31182b728b8a4f13283f33c6e2a34d3cd4b64f91d4ef8da
26
27 diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
28 deleted file mode 100644
29 index 5750e982be1..00000000000
30 --- a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
31 +++ /dev/null
32 @@ -1,81 +0,0 @@
33 -From: Julian Ospald <hasufell@g.o>
34 -Date: Wed Aug 21 14:26:38 UTC 2013
35 -Subject: several QA fixes
36 -
37 ---- a/Makefile
38 -+++ b/Makefile
39 -@@ -1,17 +1,27 @@
40 --LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache`
41 --CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache`
42 --CC=gcc
43 -+CC ?= gcc
44 -+PKG_CONFIG ?= pkg-config
45 -+
46 -+CFLAGS ?= -O2 -g
47 -+CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-2.0 libmenu-cache)
48 -+LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-2.0 libmenu-cache)
49 - #-DG_DISABLE_DEPRECATED
50 -
51 --# Comment this line if you don't want icons to appear in menu
52 --CFLAGS+=-DWITH_ICONS
53 --# Uncomment this line if Openbox can display SVG icons
54 --# Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear..
55 --# CFLAGS+=-DWITH_SVG
56 --
57 --prefix= /usr/local
58 --DESTDIR ?= $(prefix)
59 --BINDIR= ${DESTDIR}/bin
60 -+# set to 0 to turn off icons in menus
61 -+ICONS=1
62 -+
63 -+# set to 0 to turn off svg icons in menus
64 -+SVG_ICONS=1
65 -+
66 -+ifeq ($(SVG_ICONS),1)
67 -+CPPFLAGS += -DWITH_SVG
68 -+endif
69 -+
70 -+ifeq ($(ICONS),1)
71 -+CPPFLAGS += -DWITH_ICONS
72 -+endif
73 -+
74 -+prefix = /usr
75 -+BINDIR = ${prefix}/bin
76 -
77 - SRC= $(shell ls *.c 2> /dev/null)
78 - OBJ= $(SRC:.c=.o)
79 -@@ -19,26 +29,29 @@
80 - all: $(OBJ) openbox-menu
81 -
82 - %.o: %.c
83 -- $(CC) $(CFLAGS) -c $< -o $@
84 -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
85 -
86 - openbox-menu: $(OBJ)
87 -- $(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
88 -+ $(CC) $(CFLAGS) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
89 -
90 --.PHONY: clean install doc changelog check
91 -+.PHONY: clean install install-strip doc changelog check
92 -
93 - clean:
94 - @rm -f *.o openbox-menu
95 - @rm -rf doc
96 -
97 - install:
98 -+ @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
99 -+
100 -+install-strip:
101 - @strip -s openbox-menu
102 -- @install -Dm 755 openbox-menu $(BINDIR)/openbox-menu
103 -+ @install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
104 -
105 - doc:
106 - robodoc --src . --doc doc/ --multidoc --index --html --cmode
107 -
108 - check: openbox-menu
109 -- ./openbox-menu > test.xml
110 -+ ./openbox-menu > test.xml
111 - xmllint test.xml
112 - rm test.xml
113 -
114
115 diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
116 deleted file mode 100644
117 index bbdd608be6b..00000000000
118 --- a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
119 +++ /dev/null
120 @@ -1,42 +0,0 @@
121 -# Copyright 1999-2021 Gentoo Authors
122 -# Distributed under the terms of the GNU General Public License v2
123 -
124 -EAPI=5
125 -inherit epatch toolchain-funcs
126 -
127 -DESCRIPTION="Another dynamic menu generator for Openbox"
128 -HOMEPAGE="http://fabrice.thiroux.free.fr/openbox-menu_en.html"
129 -SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2"
130 -
131 -LICENSE="GPL-3"
132 -SLOT="0"
133 -KEYWORDS="amd64 x86"
134 -IUSE="+icons svg"
135 -REQUIRED_USE="svg? ( icons )"
136 -
137 -COMMON_DEPEND="
138 - dev-libs/glib:2
139 - lxde-base/menu-cache
140 - x11-libs/gtk+:2
141 -"
142 -RDEPEND="
143 - ${COMMON_DEPEND}
144 - icons? ( x11-wm/openbox[imlib,svg?] )
145 - !icons? ( x11-wm/openbox )
146 -"
147 -DEPEND="
148 - ${COMMON_DEPEND}
149 - virtual/pkgconfig
150 -"
151 -
152 -src_prepare() {
153 - epatch "${FILESDIR}"/${PN}-0.5.0-build.patch
154 - epatch_user
155 - tc-export CC PKG_CONFIG
156 -}
157 -
158 -src_compile() {
159 - emake \
160 - $(usex icons 'ICONS=1' 'ICONS=0') \
161 - $(usex svg 'SVG_ICONS=1' 'SVG_ICONS=0')
162 -}