diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index dfd965b..f921e75 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1 +1 @@
-EBUILD solaar-9999.ebuild 1325 SHA256 7a3571429ec98eb9d2545a334ad4da325386163f20b2c38ef3d33248d88d4278 SHA512 e6bd1c57581e0b2219696c437af847f0737c1e4185fca739cbf760bac30b1477467c4c00d01016144248d16fbdbb29012c5b5886ac5b8aa072ac0f9b05cec7eb WHIRLPOOL 0a560ee852be9419130cde925d19a4ac3d365f001539fe02a88d2e074699bfa60c7f601c6133b92d8a5032bccb43b5e2f0da3ace82284d0908f76df8e1692b85
+EBUILD solaar-9999.ebuild 1338 BLAKE2B 802e47166e4d9b654192cf0487c9b02911888e7bf10487786c78bb17bb0385bbed3a2651fb7da2b01dad9c4b40bc7af55b5c7f12bbafc636c492ef6c21fcd101 SHA512 86eab8bee47f3710c64e018392416d720420f040c959afd1c90256eec8cc892ef2bf8a19895a0e0bbc6c59120332318e18573c0d35560629542f9cc77ddfa9f2
diff --git a/app-misc/solaar/solaar-9999.ebuild b/app-misc/solaar/solaar-9999.ebuild
index 6a61dbb..4626870 100644
--- a/app-misc/solaar/solaar-9999.ebuild
+++ b/app-misc/solaar/solaar-9999.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1 udev user linux-info gnome2-utils git-r3
 
 DESCRIPTION="A Linux device manager for Logitech's Unifying Receiver peripherals"
-HOMEPAGE="https://pwr.github.com/Solaar/"
-EGIT_REPO_URI="https://github.com/pwr/Solaar.git"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
new file mode 100644
index 0000000..3ec719c
--- /dev/null
+++ b/www-apps/drupal/Manifest
@@ -0,0 +1,3 @@
+AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1a1db538059138780c8ebf8d0666908fb6bb3eba99fee5d5869cd12042f0d276b560b51db60803e46c146 SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760
+DIST drupal-8.7.4.tar.gz 17843961 BLAKE2B a07d6acfe41f2f347c8a335f88daa0b19c8016d0d5e533e3038585c59ad9a11cbb68f2352d59cee47c71422a261a3286053784e70cb15614ec061fb6af5d2572 SHA512 85c9e890d34bd5c725a4361030ba7a2ca71e7ff3fd89d92972bd8fcf657047d74760a897e0083dd3f0fc1c4309e87489a8730727804ae20c1be204dfa1c14428
+EBUILD drupal-8.7.4.ebuild 2308 BLAKE2B 3ad53afceb565164978938c6d1ced683084a2703302b8f70dfe28184a1d0c969b5155e3c284abc8144431acc705e6f4edd4dc22e041f681833aef030781bc955 SHA512 76af12560b41b542934b443cf19571ff0480ef954e8f3cf7a789506147b4a40419300584a332960b0eacf78f32bd15545c6c5590b5983a4f8fdb5364abc2ee52
diff --git a/www-apps/drupal/drupal-8.7.4.ebuild b/www-apps/drupal/drupal-8.7.4.ebuild
new file mode 100644
index 0000000..a8514d0
--- /dev/null
+++ b/www-apps/drupal/drupal-8.7.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/files/postinstall-en.txt b/www-apps/drupal/files/postinstall-en.txt
new file mode 100644
index 0000000..f507dc3
--- /dev/null
+++ b/www-apps/drupal/files/postinstall-en.txt
@@ -0,0 +1,41 @@
+You will need to provide a database for your drupal installation.  
+
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+https://wiki.gentoo.org/wiki/MySQL/Startup_Guide
+
+Once you have a database ready all you need to do is to go to this 
+location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+
+and provide the credentials required for the database access.
+
+If you installed into a vhost, for the above address to be accurate,
+you need to pass -h "<host>" and -d "<install dir>" into webapp_config.
+The protocol is hardcoded, so you'll have to use https:// if you're
+using an SSL / TLS connection.
+
+SECURITY NOTICE: If you use SSL on your Drupal installation, you
+should enable the PHP configuration option 'session.cookie-secure'
+to make it harder for attackers to sniff session cookies.
+
+References:
+CVE-2008-3661
+http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-secure
+http://drupal.org/node/315703
+
+To run Drupal on a web server[1] other than apache, one needs to do
+some work, mostly related to adding the configuration in the .htaccess
+files to the web server config files and enabling redirection.
+For lighttpd you may want to check [2][3] and for nginx [4][5].
+
+ [1] - https://www.drupal.org/requirements/webserver
+ [2] - https://groups.drupal.org/lighttpd
+ [3] - https://www.drupal.org/node/43782
+ [4] - https://www.drupal.org/node/1030854
+ [5] - https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
+
+After that you can start to use drupal.