commit: 4345b51b722af531e45fdc20f717f884fb8d001e Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Mon Nov 22 09:12:48 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 22 10:04:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4345b51b
www-client/surf: drop 2.0-r1 Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/23034 Signed-off-by: Sam James <sam <AT> gentoo.org> www-client/surf/Manifest | 1 - www-client/surf/files/surf-2.0-gentoo.patch | 85 ----------------------------- www-client/surf/surf-2.0-r1.ebuild | 67 ----------------------- 3 files changed, 153 deletions(-) diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest index 3d1984435d02..2f3d6a3bbae9 100644 --- a/www-client/surf/Manifest +++ b/www-client/surf/Manifest @@ -1,2 +1 @@ -DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5 DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12 diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch deleted file mode 100644 index b0a7b5c8ef0f..000000000000 --- a/www-client/surf/files/surf-2.0-gentoo.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -4,28 +4,28 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = ${PREFIX}/share/man - LIBPREFIX = ${PREFIX}/lib/surf - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = $(shell $(PKG_CONFIG) --cflags x11) -+X11LIB = $(shell $(PKG_CONFIG) --libs x11) - --GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0` --GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0` -+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gthread-2.0 webkit2gtk-4.0) -+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gthread-2.0 webkit2gtk-4.0) - - # includes and libs --INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 -+INCS = -I. -I/usr/include ${X11INC} ${GTKINC} -+LIBS = ${X11LIB} ${GTKLIB} - - # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} -+LDFLAGS += ${LIBS} - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC ?= cc ---- a/Makefile -+++ b/Makefile -@@ -15,18 +15,16 @@ - @echo "CC = ${CC}" - - .c.o: -- @echo CC $< -- @${CC} -c ${CFLAGS} $< -+ ${CC} -c ${CFLAGS} $< - - ${OBJ}: config.h config.mk - - config.h: - @echo creating $@ from config.def.h -- @cp config.def.h $@ -+ cp config.def.h $@ - - surf: ${OBJ} -- @echo CC -o $@ -- @${CC} -o $@ surf.o ${LDFLAGS} -+ ${CC} -o $@ surf.o ${LDFLAGS} - - clean: - @echo cleaning -@@ -44,13 +42,13 @@ - - install: all - @echo installing executable file to ${DESTDIR}${PREFIX}/bin -- @mkdir -p ${DESTDIR}${PREFIX}/bin -- @cp -f surf ${DESTDIR}${PREFIX}/bin -- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf -+ mkdir -p ${DESTDIR}${PREFIX}/bin -+ cp -f surf ${DESTDIR}${PREFIX}/bin -+ chmod 755 ${DESTDIR}${PREFIX}/bin/surf - @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 -- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 -- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 -- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 -+ mkdir -p ${DESTDIR}${MANPREFIX}/man1 -+ sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 -+ chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin diff --git a/www-client/surf/surf-2.0-r1.ebuild b/www-client/surf/surf-2.0-r1.ebuild deleted file mode 100644 index a9ddb0ae30b3..000000000000 --- a/www-client/surf/surf-2.0-r1.ebuild +++ /dev/null @@ -1,67 +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 simple web browser based on WebKit/GTK+" -HOMEPAGE="https://surf.suckless.org/"; -SRC_URI=" - https://dl.suckless.org/${PN}/${P}.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -COMMON_DEPEND=" - dev-libs/glib:2 - net-libs/libsoup:2.4 - net-libs/webkit-gtk:4 - x11-libs/gtk+:3 - x11-libs/libX11 -" -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND=" - !sci-chemistry/surf - ${COMMON_DEPEND} - !savedconfig? ( - net-misc/curl - x11-apps/xprop - x11-misc/dmenu - x11-terms/st - ) -" -PATCHES=( - "${FILESDIR}"/${PN}-2.0-gentoo.patch -) - -pkg_setup() { - if ! use savedconfig; then - elog "The default config.h assumes you have" - elog " net-misc/curl" - elog " x11-terms/st" - elog "installed to support the download function." - elog "Without those, downloads will fail (gracefully)." - elog "You can fix this by:" - elog "1) Installing these packages, or" - elog "2) Setting USE=savedconfig and changing config.h accordingly." - fi -} - -src_prepare() { - default - - restore_config config.h - - tc-export CC PKG_CONFIG -} - -src_install() { - default - - save_config config.h -}
