From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- www-client/surf/Manifest | 3 - www-client/surf/files/surf-2.0-gentoo.patch | 85 ----------------------------- www-client/surf/surf-2.0-r1.ebuild | 67 ----------------------- 3 files changed, 155 deletions(-) delete mode 100644 www-client/surf/files/surf-2.0-gentoo.patch delete mode 100644 www-client/surf/surf-2.0-r1.ebuild (limited to 'www-client/surf') diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest index 472d7e34f446..6cd99e3cab8c 100644 --- a/www-client/surf/Manifest +++ b/www-client/surf/Manifest @@ -1,8 +1,5 @@ -AUX surf-2.0-gentoo.patch 2395 BLAKE2B 45722d17b9ec85601d7354b7714388ca6cbc041c88e0a75bca609bffec31956bbe5567b0674f242a81eb551ecf7844f6d6ed742fe3176ccf308c743fcd2f881f SHA512 109d49f0648942781781c970be518c83c89137af6c578773da23a96b20cc922a11b5478453439d4dd22f934ad8f8a3989c2f62620a9312cfaea4753efa9ee7c2 AUX surf-2.1-gentoo.patch 1082 BLAKE2B 76aeff15766cc1fe4355b04a5133e55e93dbcf4e3cda8c4a386f8f4a4e5a40ce40c82736b33619f14c770031366aecfb0df4404982b834df8013845ff3f392de SHA512 2dbcdbbc869780a5b265dd909164e9764771e9a6c20664927f7df358daaadc83f65a915aabe65559756f6fedfcebad5496433ecb555ed0de55ced988102681ef -DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5 DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12 -EBUILD surf-2.0-r1.ebuild 1220 BLAKE2B f0d509f11751b7e714f2ee38a3506b715ec7e41207de8f18a6c9fd6473895dac63bda8589a8839212babf5ba1b7a9ad0cdf654759e0e015bf2f7b18c23217caf SHA512 ac693af61ce07b3f112f68604074f708419e7c98d8e289a0f37bbe908506935ee4fe46a682f6ce484dac29e99a9441c424040655971f6453ef87b01f5c65cc4a EBUILD surf-2.1.ebuild 1408 BLAKE2B 8b82b3166d3263e0b6c10e5d54e93851fffbab83b32c3e8b00004378a9d2b0207edc05e6e405e09ab19e95e9eb32994dae5d93744b7e83bfba4a7cfb5d05da9c SHA512 1e9ca8126275d7a16e52bcb3007a752d4c4955bf3feec9edd58b28475f98082c8a1fd7f593b1f586b3f1c98b6fec0f540e43e07bb2a1eb098d916b062f640c97 EBUILD surf-9999.ebuild 1862 BLAKE2B 32d174dce4c799a5555602454dfc25264cc2d0d84f85895996fa555869c22f9c60b8a0696cb98156d8d0faea3de2d2fabdf84fc8a20313cfe038b543053e4a13 SHA512 81676813aa151ac0f755d1da5870201ed121c060dded59d9fd04d3ccc8a3007b6dc7ddd483b3d8e26bc789ba06cf0ff6513c57a840e90732394a9ee9fc6b57bd MISC metadata.xml 698 BLAKE2B 5d07ccdc2993d6c7ba87076d37536d11fe799feb1234ad088cf4a60c9f0078cdb5f934ad752e27415bb6e76b3ebebf60830af463afca03c92e887428f4982478 SHA512 09ee0c4907018041ebdd7fb1c63c9200fd66a02baab706fd48775d1b557072f551be93d40284e5ce90b1b181a9cfd259c9b19411647e276c10aaf78672a4cf08 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 -} -- cgit v1.2.3