reinit the tree, so we can have metadata

6 files changed, 324 insertions, 0 deletions

diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
new file mode 100644
index 000000000000..c8a35c100bdf
--- /dev/null
+++ b/www-client/surf/Manifest
@@ -0,0 +1,8 @@
+AUX surf-2.0-gentoo.patch 2393 SHA256 ecf9d5e57511923f5e25635f38db757376fe7f31ebfcdf08dc6b73be40d1c8f4 SHA512 7c431dca5805eda29f68d52798f1b6bfc9df89ee342fb183241f6cf06a760ae7bb61dd6a976c2b21404edf25afae25b9696971d8a1ba0904045af2914d64a8db WHIRLPOOL 4c019485fe646ef8a1d8a623b79e17c45dd55b66022a0bd533f1d12a303eb71b30cd0e64a46c7e8d4f85c458c48ea8aaf00351b60134f05a653d69427cdb377d
+AUX surf-9999-gentoo.patch 2374 SHA256 73623fc934673879c0a83451ee654ec08678aa083c8781c7720d3d49c7e548df SHA512 d7d8c829bfb2534432e9e815dea283d97cdb77982aa6fcec2d3e5b716599cbbe14eefd75219404c35eed2d1380c2d1a1e7334fd24fd0905830dee8e1baf7c801 WHIRLPOOL a29809059476ff6eec7cad17f5b758b854d1ca051e9284670941a3274c1c355361ae4ec4de6f60f86bd0cecf1e3e9742fe3fcc3301d6701c1130ca11eaa7c692
+DIST surf-2.0.tar.gz 19056 SHA256 faee4c7a62c38fc9791eff1ad06787c3c9b2b79f338806827f5152a7bc54951d SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5 WHIRLPOOL 5cb76a924b0f1e97727321515deb84661f72ee892a7a34ceccdcc13fd6b994572021411b29603056af3f48efbbe66ee3318eab0828eb4a129366a5b79498eb0b
+EBUILD surf-2.0.ebuild 1470 SHA256 66fd6a8912c0f5518674e862122427516e234622788a7579ed62b19db993e76e SHA512 d5af5520d3e0998ddfedf5270676d2a6c0a8ef0589cf4d2a633434a34cf7d3b98a72523a225c373a1cefebddce9c73a5a1d27e8f17718dd3eab5eecb7216eff8 WHIRLPOOL 9224d0eef7ded684eaefd37f76839dd9e82b467355a3158605afdc6d7fc67f3a2c3d3e3a7619963da9832c3d60fd98d129d673ac11f6b467265f38c104f97557
+EBUILD surf-9999.ebuild 1254 SHA256 ac28760cb330f671ce0497ca3b924c96920fecf080940c10fc10b5cc83464db3 SHA512 752562ac77fb0944bdae42d17764286bd2884aca0f223a67032f31b7d2a2d38d799a923321c245290a3ca89685487b15db90b82c317a8d6aedcc00585a6ab6f0 WHIRLPOOL 8bef3d1bb8e420e581dd86f4146c4951fd91b2a74f6a87d163fbe38b97fb2865d7782c5ad42df70e78967ebc67f15dd8827cdbf13ddd4af3f0c4c4e053dd8951
+MISC ChangeLog 3079 SHA256 f7ebe4c06b4a7675d2076cca8f8b903addbbc7cf8e0145d9469bbcea83c21c16 SHA512 e9e57becd9d7a93468698e3f456162ab19896f334779332a9176da5e6e520b56f29aa328fcde9a75b2a934f0c4833b2b4c2e630f416c04b3e6b1752dc468af1f WHIRLPOOL 831e37b202a9c20737496841dbdad60a9195022c4d9a7c25a54e7042751d70325e06d723fc37d611e4c2475e85998d121f7d2697b099f826d2ff55958fec414f
+MISC ChangeLog-2015 5059 SHA256 9104d3df559c265717b9757bbfadf3c4e12721c2e3a379e4d59f87b7ef5688c8 SHA512 72793c72dbf744687ec67a922a567ed7caa55c56dec21771d8ae76090cbd3df9ff5de68a94a81384670d58b9556629d591a829ad9536a262e0bd64ac4af3df94 WHIRLPOOL d702ab0db929ceb4cb101f0fba4c7ed78ed121d12456e914efc4f8bcae4d694010dd20782d4e9f0bb9015f6c5d2202683616942a80e8955024e6a689cb10122a
+MISC metadata.xml 391 SHA256 0bdc60cd67f926693d475031b78f7954c9d5dc305edf5f87acb77a8fdd09993e SHA512 cbfbe5cdabbe5c9a41b6a190fc675518fbbc682d47b2dce2c832e0afa8fbab0c5d0cce48d3666252d352ca2fd47788b928d69ca616a5258b4abf7873bf4c53f0 WHIRLPOOL 5badf53e628adaa5b886ecd64f2919c97d838873abab42a7581419cf1a8b2662cc3f4c00a7263565f49eb2d1cafcaca740d5b2799bbe1837ad80c67d36cb1c79
diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
new file mode 100644
index 000000000000..07aa6568f55c
--- /dev/null
+++ b/www-client/surf/files/surf-2.0-gentoo.patch
@@ -0,0 +1,85 @@
+--- 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
new file mode 100644
index 000000000000..46f8fe3abb5d
--- /dev/null
+++ b/www-client/surf/files/surf-9999-gentoo.patch
@@ -0,0 +1,80 @@
+--- a/config.mk
++++ b/config.mk
+@@ -4,25 +4,25 @@
+ # 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 gcr-3 webkit2gtk-4.0`
+-GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 gthread-2.0 webkit2gtk-4.0)
++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 gthread-2.0 webkit2gtk-4.0)
+ 
+ # includes and libs
+-INCS = -I$(X11INC) $(GTKINC)
+-LIBS = -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 -DGCR_API_SUBJECT_TO_CHANGE
+ SURF_CFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
+-SURF_LDFLAGS = $(LIBS) $(LDFLAGS)
++SURF_LDFLAGS = $(LDFLAGS) $(LIBS)
+ 
+ # Solaris
+ #CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\"
+--- a/Makefile
++++ b/Makefile
+@@ -16,18 +16,16 @@
+ 	@echo "CC       = $(CC)"
+ 
+ .c.o:
+-	@echo CC -c $<
+-	@$(CC) $(SURF_CFLAGS) -c $<
++	$(CC) $(SURF_CFLAGS) -c $<
+ 
+ $(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) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
++	$(CC) $(SURF_CFLAGS) -o $@ $(OBJ) $(SURF_LDFLAGS)
+ 
+ clean:
+ 	@echo cleaning
+@@ -49,13 +47,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/metadata.xml b/www-client/surf/metadata.xml
new file mode 100644
index 000000000000..4a8cfc931d24
--- /dev/null
+++ b/www-client/surf/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</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
new file mode 100644
index 000000000000..33d0ddd78c8a
--- /dev/null
+++ b/www-client/surf/surf-2.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	!sci-chemistry/surf
+	${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-misc/dmenu
+	!savedconfig? (
+		net-misc/curl
+		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
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 ]]; then
+		ewarn "Please correct the permissions of your \$HOME/.surf/ directory"
+		ewarn "and its contents to no longer be world readable (see bug #404983)"
+	fi
+}
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
new file mode 100644
index 000000000000..c21a83052259
--- /dev/null
+++ b/www-client/surf/surf-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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/libsoup
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	x11-libs/libX11
+"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="
+	!sci-chemistry/surf
+	${COMMON_DEPEND}
+	x11-apps/xprop
+	x11-misc/dmenu
+	!savedconfig? (
+		net-misc/curl
+		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
+}