Remove depend.php (552872), bump, clean up

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 31 insertions, 20 deletions

diff --git a/www-apps/tt-rss/ChangeLog b/www-apps/tt-rss/ChangeLog
index 62dde15963a7..c8db109ab3bd 100644
--- a/www-apps/tt-rss/ChangeLog
+++ b/www-apps/tt-rss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/tt-rss
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.38 2015/03/23 13:01:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.39 2015/06/24 11:07:30 tomka Exp $
+
+*tt-rss-20150624 (24 Jun 2015)
+
+  24 Jun 2015; Thomas Kahle <tomka@gentoo.org> +tt-rss-20150624.ebuild,
+  -tt-rss-1.15.3.ebuild, tt-rss-20150304.ebuild:
+  Remove depend.php (552872), bump, clean up
 
   23 Mar 2015; Thomas Kahle <tomka@gentoo.org> tt-rss-20150304.ebuild:
   Call webapp pkg_postinst again (bug 543626)
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 8e73fd4c33d1..f666614226c1 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -7,16 +7,16 @@ AUX ttrssd.confd-r1 653 SHA256 0ac166b3531731d070e14874d0a26de10adadf6f8014dd705
 AUX ttrssd.initd-r1 2010 SHA256 ad11896f9cafa7b95697c48772c6edce7b4521a7c5db83a90e2a8f75861c871a SHA512 00cb141e55c3e7ea06bf7efcf7a5be84084bfa71318d1cae1eb55df50f692431202fb5778e31d45c593540dad786979a8ab7349a34406d44956d817a6ac9ee06 WHIRLPOOL 47ada7ba997260391bcf3fec219001dd768bdb45f36eab46dfbdea0dc8031622455bab65d3a98a265f6afe9a40fdf303b3a33d707794f50f396cb6e1596c0140
 AUX ttrssd.initd-r2 2382 SHA256 e741db2070e02ee6ab5f09df9e1372e96b0a3a047680fe3824ccb664fdd324c3 SHA512 56a59f8e14b2b21c7c51259567b08b8db5f45c56698b8d1730b53e7dd362cc165c6dd627462db559153403bc3944a465c98fa9c491a114e75093542f48110927 WHIRLPOOL 85f5177a2db6804847db9c7cae57d61fd369a13cecf1cc7ac972b37b8537dd386506439eaa01c1295f1996618dc5d1043bb9961ea16b8a2bd2b2b93c68b3ea04
 AUX ttrssd.logrotated 118 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da SHA512 e56085ea83ec1f1c80edf253e315b7197f884972f6dea439958cdcf217c44592a9eac75cc96494136aaa5a8e1eae6304527ef2d144ba797716ca58ff16641019 WHIRLPOOL a5a841f269bd5b7597ff6aa51d6d7ca7c38b12f887a785670c304b4414d236a8b90c3ac8707f255425e1f4888ad8fa0bb2d199522cab947c4a74d6ba1577e7f6
-DIST tt-rss-1.15.3.tar.gz 2802685 SHA256 d3a3b5bf82aa5f647769ff945fac62458b4b422ead4e55007968074aa695c0a7 SHA512 747336e0d0d6c7c6641c1ac67d1128522ae589f8b5f0c9cff64f8c015a463f13f224add3992a0bc90a961768b2ef0008b55112c813068a9cc4ea66ec812766bd WHIRLPOOL a0c96c84f25d2b5bfb40f4d81fb7a952e1643201f6f059ca68cbb71c082b1e58db92cde8d0c0cc42552196c2b7356d07cd31ff855739cbb92cd35db3a1f1fcc7
 DIST tt-rss-20150304.tar.bz2 2021676 SHA256 72ec8863c0697a311c3a7b641ade8be4a0e85674aead50bdf03637d76b4eeac3 SHA512 6b26e6a4e0c41bd48efa3506b441adec7ef95c80c208784482e77a382ab4473d152f9ef6436c5e398563c76de634b99a1e1b13efeeb82d30659d4ccf21117ff7 WHIRLPOOL 799c8df18fb5b10c76ce3eb97be77611c0438be7f9b3cd9d4d85cde2d4951c5690b905b3938b574c1810d0ec81d1c246c62769b199a93c72ec0bb4564e56358f
-EBUILD tt-rss-1.15.3.ebuild 2170 SHA256 05ddf08fc1785acaa66fd372e3657c5aeceecf0c9cd60093120cd60c17cb3db2 SHA512 d609fbcc0e7b729d59a82635d7b3bffe170edd0ec30b86b6f2c443230e3d18993a4e581037574c331aff0cbb5293b202f45a879bfdd6aa633e7872b75a05f677 WHIRLPOOL ebdea6bbc56c3a788598caa38d9a8db9cdb26c784062dab90b1deafbd0bea13ceacc6d9ca7e80e973846d45b3e1f81bb33c9a3b5b3a0d8d6d7b7bbe6fa936756
-EBUILD tt-rss-20150304.ebuild 2255 SHA256 73a2cce4859573bc01badc5feece17268864a26a874d3d0fb083a5cafd5fa891 SHA512 bb9227f255800dd5fec0c8c54e70c6e8ec75750675236bcb7d6aaf109209d5ad1e6bfd6f5c3023838ccec17cc32a74865a49e56a360456df440f917b73014370 WHIRLPOOL 07ceb2cb31df6a5fca4bb6f2c7593a3fcf1e0fc6f86b310af5d56ce85a946a793816f1476b3c33d48cc5cf49bc490da7b09988e6998d857df5381f92f7c166aa
-MISC ChangeLog 6750 SHA256 2753e190b4975cc6678574f2c278537cf3ed1fa47271eccb6836a7cccdc96eb0 SHA512 8c326ad5fba32d5af93a90cdc6cf7583108e06ba3c455ae780eb91495438adfb852c8b6abbba36a4b3111272e2dc2f4a4cbe4a6b8f2972d37852d45e98c1e0ea WHIRLPOOL 31653c6d73ebba3071ce619f0256d3b0d7b148996f12927c9130d9ac4d2efdc9e3ca5ac30b50f466b3b0e630f0d7cf8bcb0b1cafd8452f74531d6ad5c592c8b1
+DIST tt-rss-20150624.tar.bz2 2071177 SHA256 544833ffbdb83497270aa3c3599ad78f58b23bbaf9d492a3b73bd156b806edc7 SHA512 270f88ae84778cf2a5df1dcda2bdc58a0ed8f4988c124728d4aad29324dc86b1b0245c5b651c738febc9447a5533ca68e2655966409a45651c6df3a08e203c1e WHIRLPOOL 8e30b32beb6eba33e6f87c06900804f6f1f3a11ec0ce4c565e7558577f2bea813e082e7d76acb83f0c0aa5a387ef8266f3fc218def482e9508c492e7df5b3b7a
+EBUILD tt-rss-20150304.ebuild 2240 SHA256 f21053e5b5180a9ff4763ca5d36858bfe1e386ee83b4ddd1a7c4ae75f9ef3fa3 SHA512 5dd1a2cf0eb230e415a3f5e4fd1dd878a254c6b6091eb64f4da9d62ef24bb3496ea077e6bdad179c5b0154c691bd8a20b7693a64d258f8d701568b0d5451c1d2 WHIRLPOOL abcf09fa9c7173cf149478de636e0aa24b4300f72bad009dfe5a26a84ac5b3eae83ee1066e9a592c4496eb2ea26e423e0d4ccd5720019c5c6711be36749bcb05
+EBUILD tt-rss-20150624.ebuild 2262 SHA256 864d88347f0c62319ea54ab21df9086a5bfc5d95f8cc33ef9681715702d711ba SHA512 5cd69850cf5ca09178834767f4ec59efd5fc2e1e75fcdd03e686821bfa6bc02695331825c4e1ed2fec5d3156c2bbff29acf81f2576c01a5f61b786f158fc3054 WHIRLPOOL 622e911636d349a73a6b043083b030d49f51905817e52314e748789d12f8225d6ada405111e886210b3537f3e9afada8537ac92b30e21f91858126472455c4da
+MISC ChangeLog 6949 SHA256 a7c58eaa6f1fa36480bc6ec1a2123d4acee23cf560c356f8af2ccbb793f1b1b4 SHA512 7c605901c6e9774c198eb5a067facb44597737f0894ef1f5ed19132b98c5da0339c5c5ed8ec16b32b6eb4d289413072375a613e4d1a7be29cba441b4f99d636b WHIRLPOOL 96f3ae7db09e70d391a838b2dc72096072542cc8f197d74684c924eefebc96062a9dc3cd055bcee2f37be90db217fb5b7b84eefc5fe1f15821d21d45b65830df
 MISC metadata.xml 376 SHA256 c2e5b6b13e251f9e30c42abbc9ed5f5d40d6b6c9695e777494aa78c4f32f9682 SHA512 f574f1249e530797048c70cbb1cf0de1c1ae788f0c86ba8ab63ab89ec364a523e5840debe436eaaf8a2f1a7139427d66f9effc5e23e41ca3bbe49c06a0eb9ca0 WHIRLPOOL eea384860f2114c18f9504d18f18ac9f598d973dbea572b0409c09f53d77147a659bdbd2a3e4cbec4db7aac54d534ddef39933f1ff3d086b5236e797d0b2ba9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUQDyAACgkQid6yGVZcMrxffwD+JSozztI0wBDyyjVEj46iYYw6
-Jdo0h9z7Ha2rhIW26IEBALkjGM9IZ/PJ/qvgZmSWumofhAEPat1SBFQPI7PfmWrY
-=CWlN
+iF4EAREIAAYFAlWKkGAACgkQid6yGVZcMrwmJwD/dV4kDF+2/u1XRuPfnl6mLD4Q
+VlM/hcp8SoOdCmPLXdsA/RwwtUJbbJqsrM2WxmoDp/tn4xrnWRpBQxREQcaaGhWw
+=0z7+
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tt-rss/tt-rss-20150304.ebuild b/www-apps/tt-rss/tt-rss-20150304.ebuild
index c6c20dc386b6..7986294a3f14 100644
--- a/www-apps/tt-rss/tt-rss-20150304.ebuild
+++ b/www-apps/tt-rss/tt-rss-20150304.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild,v 1.2 2015/03/23 13:01:06 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-20150304.ebuild,v 1.3 2015/06/24 11:07:30 tomka Exp $
 
 EAPI=5
 
-inherit user eutils webapp depend.php depend.apache vcs-snapshot
+inherit user eutils webapp vcs-snapshot
 
 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
 HOMEPAGE="http://tt-rss.org/"
@@ -15,15 +15,15 @@ KEYWORDS="~amd64 ~mips ~x86"
 IUSE="daemon +mysql postgres"
 
 DEPEND="
-	daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] )
-	!daemon? ( dev-lang/php[mysql?,postgres?,curl] )
+	daemon? ( dev-lang/php:*[mysql?,postgres?,pcntl,curl] )
+	!daemon? ( dev-lang/php:*[mysql?,postgres?,curl] )
+	virtual/httpd-php:*
 "
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="|| ( mysql postgres )"
 
 need_httpd_cgi
-need_php_httpd
 
 pkg_setup() {
 	webapp_pkg_setup
diff --git a/www-apps/tt-rss/tt-rss-1.15.3.ebuild b/www-apps/tt-rss/tt-rss-20150624.ebuild
index 135328e1ae17..e4e9f18083c4 100644
--- a/www-apps/tt-rss/tt-rss-1.15.3.ebuild
+++ b/www-apps/tt-rss/tt-rss-20150624.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.15.3.ebuild,v 1.1 2015/01/05 16:43:57 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-20150624.ebuild,v 1.1 2015/06/24 11:07:30 tomka Exp $
 
 EAPI=5
 
-inherit user eutils webapp depend.php depend.apache vcs-snapshot
+inherit user eutils webapp vcs-snapshot
 
 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
 HOMEPAGE="http://tt-rss.org/"
-SRC_URI="https://github.com/gothfox/Tiny-Tiny-RSS/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~mips ~x86"
 IUSE="daemon +mysql postgres"
 
 DEPEND="
-	daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] )
-	!daemon? ( dev-lang/php[mysql?,postgres?,curl] )
+	daemon? ( dev-lang/php:*[mysql?,postgres?,pcntl,curl] )
+	!daemon? ( dev-lang/php:*[mysql?,postgres?,curl] )
+	virtual/httpd-php:*
 "
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="|| ( mysql postgres )"
 
-need_httpd_cgi
-need_php_httpd
+need_httpd_cgi  # From webapp.eclass
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -82,3 +82,8 @@ src_install() {
 
 	webapp_src_install
 }
+
+pkg_postinst() {
+	elog "You need to merge config.php and config.php-dist manually now."
+	webapp_pkg_postinst
+}