commit 4453bac64770b528701441a1959cb300b47fedd1
parent 045949797c9715f7187dda1c0a204d51573e127e
Author: parazyd <parazyd@dyne.org>
Date: Tue, 24 Nov 2020 15:32:27 +0100
www-client/surf: Remove.
Upstreamed to ::gentoo.
Diffstat:
6 files changed, 0 insertions(+), 264 deletions(-)
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
@@ -1 +0,0 @@
-DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
@@ -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/files/surf-9999-gentoo.patch b/www-client/surf/files/surf-9999-gentoo.patch
@@ -1,30 +0,0 @@
-diff --git a/config.mk b/config.mk
-index f1910bf..55d7066 100644
---- a/config.mk
-+++ b/config.mk
-@@ -4,18 +4,18 @@ VERSION = 2.0
- # Customize below to fit your system
-
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = $(PREFIX)/share/man
- LIBPREFIX = $(PREFIX)/lib
- LIBDIR = $(LIBPREFIX)/surf
-
--X11INC = `pkg-config --cflags x11`
--X11LIB = `pkg-config --libs x11`
-+X11INC = $(shell $(PKG_CONFIG) --cflags x11)
-+X11LIB = $(shell $(PKG_CONFIG) --libs x11)
-
--GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
--GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
--WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
--WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0`
-+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0)
-+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.0)
-+WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0)
-+WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0)
-
- # includes and libs
- INCS = $(X11INC) $(GTKINC)
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>parazyd@dyne.org</email>
- <name>Ivan J.</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy maintainers</name>
- </maintainer>
- <use>
- <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
- </use>
-</pkgmetadata>
diff --git a/www-client/surf/surf-2.0.ebuild b/www-client/surf/surf-2.0.ebuild
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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
- 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
-}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit git-r3 savedconfig toolchain-funcs
-
-DESCRIPTION="a simple web browser based on WebKit/GTK+"
-HOMEPAGE="https://surf.suckless.org/"
-EGIT_REPO_URI="https://git.suckless.org/surf"
-EGIT_BRANCH="surf-webkit2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-COMMON_DEPEND="
- app-crypt/gcr[gtk]
- dev-libs/glib:2
- net-libs/webkit-gtk:4
- x11-libs/gtk+:3
- x11-libs/libX11
-"
-DEPEND="
- ${COMMON_DEPEND}
- virtual/pkgconfig
-"
-RDEPEND="
- !sci-chemistry/surf
- ${COMMON_DEPEND}
- !savedconfig? (
- >=x11-misc/dmenu-4.7
- net-misc/curl
- x11-apps/xprop
- x11-terms/st
- )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-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
-}
