Version bump. Bug #443488. Thanks to Patrick <mail@patrick-nagel.net>

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 113 insertions, 33 deletions

diff --git a/www-apps/tt-rss/ChangeLog b/www-apps/tt-rss/ChangeLog
index 9d7b16763eed..981b3f5d0e27 100644
--- a/www-apps/tt-rss/ChangeLog
+++ b/www-apps/tt-rss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/tt-rss
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.10 2012/05/23 18:46:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.11 2012/12/03 19:42:26 hwoarang Exp $
+
+*tt-rss-1.6.1 (03 Dec 2012)
+
+  03 Dec 2012; Markos Chandras <hwoarang@gentoo.org> +tt-rss-1.6.1.ebuild:
+  Version bump. Bug #443488. Thanks to Patrick <mail@patrick-nagel.net>
 
 *tt-rss-1.5.11 (23 May 2012)
 
@@ -55,4 +60,3 @@
   +files/postinstall-en.txt, +metadata.xml:
   Moved from sunrise overlay. Thanks to Patrick Nagel <mail@patrick-nagel.net>.
   Bug #250607
-
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 1763440d3b42..1b8f6273bae9 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,37 +1,39 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX postinstall-en-with-daemon.txt 654 RMD160 6b1e5fffd52ef90dc7cd23a8b01494e94cd19205 SHA1 e4e1bc39e3f036faca14a56bbf8b01823e0ad867 SHA256 0e73e858546452123e0b7a4df23eb48fc026dfc9449170a5d2b8476c8054d15f
-AUX postinstall-en.txt 256 RMD160 67fd15fd857fbccee0467d71a888bc78d79ee335 SHA1 a818580fdf5a2c06e6f9f3bc391815ca86f118d5 SHA256 8092f3274aad3c344dcc8ace99bcaa06975017bb8d069ab899013551b3580b63
-AUX ttrssd.confd 177 RMD160 0f69720fe21e3ecc4fa84b265e70d8880fcae53e SHA1 4446fd7f1b276439ab0e7bb3b45d65640a1e711c SHA256 ea42131c4117622b1fa3695931708a1606d2d3f4c696f346f36510e12d4a6706
-AUX ttrssd.initd 1365 RMD160 dad187906cb0fa3ef3f0efb7fe91058a436005a5 SHA1 30356efb5e4933c2947bb480583a4df4d49d1170 SHA256 aa84056d0f34070bb6d3b24088d3165480d96ce02dca597f9c44d7aaa2048152
-AUX ttrssd.logrotated 118 RMD160 f2646794119f67f365ef02dce079ab06eedf6825 SHA1 4d1e93a8df05488baf23067a983e5a70d8e4dc91 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da
-DIST tt-rss-1.5.10.tar.gz 2752801 RMD160 20694c01b56c34c1282d2dbbf0a12c740951edbc SHA1 a5d3ec7b97cd3c0446c7a1123746983df10a54f0 SHA256 a80d292b85fd254d4ebe26a781a75ef696c5649cc6f702f8b3e51442c64986e7
-DIST tt-rss-1.5.11.tar.gz 2755392 RMD160 cf4da5b50ace80b0074f16197e1ab9dd8452b178 SHA1 c22502c48c8843fb45242cbd9fddf806f64a1368 SHA256 3a3edbfe59b08ea57d322bdeeb06be1970226c854691542753dc12f0fc9e876e
-DIST tt-rss-1.5.7.tar.gz 2808220 RMD160 9541c4b2d5f4b4cf47d0510495c04d5991addba7 SHA1 b086f52de3a6d50d111c35c0f589152e68ab6917 SHA256 5599f1f90f29c21e7e6531b74e7a40721e771fc6f1106d754923cfc1a2124264
-DIST tt-rss-1.5.8.1.tar.gz 2750347 RMD160 34debfd095b8783ce4c58239c28fc709c15ce92f SHA1 18ac3498e787d91f1c573ade9457a34593e0d773 SHA256 110f6cb6b5127e9970a02abe37022f415205abfd2c533970498ea8bc629a0bec
-DIST tt-rss-1.5.9.tar.gz 2816459 RMD160 403c8eaf48f783a374e8db0a26d059c165b1587d SHA1 40a4df62f34ed56e4e14971f42472ba909e5f3ef SHA256 280121f2f8fc38ff5fbd8ccf1d31f0fa7e433e57ad6f8dfffc971a1f75b0c691
-EBUILD tt-rss-1.5.10.ebuild 2160 RMD160 c05e65440bab058e34ff8868b3dc1f37c1f840e3 SHA1 53c00dab183cd671a616392f886da9145cc79890 SHA256 68a86b831be91780a375a4cdde68319652f53135dd1b16774079f5e9067567ec
-EBUILD tt-rss-1.5.11.ebuild 2160 RMD160 cabca5c814ddcc4f1be3554b6f78c010f215c95d SHA1 23d6e9dd06a374f5a6fa03612a3daa67b4228e45 SHA256 c73906e29bda6019186d7c047ded93686a2eca4e4507858917616df2a8af2769
-EBUILD tt-rss-1.5.7.ebuild 2082 RMD160 886a13b644294cf3a9eaf878bfcc3986f3858b31 SHA1 0fad029d8fb60330142bd64d7298b213a496d4e8 SHA256 3f9b12397ef8300dae40be19018fbbbcf941ce67983e590b207e541c044b329a
-EBUILD tt-rss-1.5.8.1.ebuild 2083 RMD160 6c8f0f7b0583fde5fddc9a91ccf2ba67c4bb1dc3 SHA1 e38a5ea2361c024fb549fcb5d3ce216a1f91987a SHA256 d17bd1d2e299bd2f8d0eaef6683bc9521ebecee9b85d22f9c3ff1826a5ad2734
-EBUILD tt-rss-1.5.9.ebuild 2159 RMD160 64b5156681f1dafecad748237100efd550202af6 SHA1 2686e9633cf5f7c6ef30dadb9c7ec7e54a3a7ad6 SHA256 b62a0eaf8431b7acfa9970afe578f6501331715dc782d52902ec2355630fc162
-MISC ChangeLog 2123 RMD160 823b4cde335660e2600654d362f019a69df4e0fb SHA1 2b52f11d58287713789f6c7a6c5ac6c952ac9ffd SHA256 279e26f847b547532acb4492851a09efe9fa2f957ef4d03bd1388c0b5e707a51
-MISC metadata.xml 549 RMD160 c1331c3470dc6bebb5823af200cf087b3e292d61 SHA1 115dad0a7ecf068d8ac2037a78572255e85d463c SHA256 f364007d61e0c2025e3f87f542d4abf3aab20ff6bf23ebd9980ccec03c3e1352
+AUX postinstall-en-with-daemon.txt 654 SHA256 0e73e858546452123e0b7a4df23eb48fc026dfc9449170a5d2b8476c8054d15f SHA512 c4257b29ed973a7935037d07d0de08efef4ed045ead83d2b714d293583ea24fa672800c88a80d1f2d660cfa52820afc5c1adaea28c5f60e406af0ea6664c41a0 WHIRLPOOL 964b1662a438994530a20136a73cd15c1d24eab4890503b05d38b157109c758e0492908c4ebbb09b22b79d1190aec8ae1d3e620a38a30a0bdf6d2dad3ac8c2af
+AUX postinstall-en.txt 256 SHA256 8092f3274aad3c344dcc8ace99bcaa06975017bb8d069ab899013551b3580b63 SHA512 dd1145e68a0cdcf52b939dba665c36c2490c2a377f8158defa35f5b63197290c2f769689afb9551e6a5a75c62a4b380859edaac1be5f269fbda1bec91f44b43e WHIRLPOOL f521ffa9186dc2163e81a6d2b46cafac8d5de9d102ba711d9e3897eec9614994c0db56b565c38125dbd927084855e4148ca6a548ccf823f640497cd2b2e96197
+AUX ttrssd.confd 177 SHA256 ea42131c4117622b1fa3695931708a1606d2d3f4c696f346f36510e12d4a6706 SHA512 0a4745d93e92f705cbc12421098f84a2024c90190e3ce3388d1d6fbdcc03112c0adaad2ebdfc97154a27ecc8c1d7a954730aa2acafb67741a5ddd76007722767 WHIRLPOOL 77272205db8778c0f83bb093a45eddb089ea9e1fd9ac5631916b1f47bd4395c83c1d5f53128acfb61d45fcc1a208d04c80df57424a6ac0b984e62bd88794afc9
+AUX ttrssd.initd 1365 SHA256 aa84056d0f34070bb6d3b24088d3165480d96ce02dca597f9c44d7aaa2048152 SHA512 1845796c1e718a1daa4aedf84e0dda4946c88318cafd769f7197875bdedcf271d34a3d54052ff57f47f827a68ff89d9e889b560d5ca3831bc5d712f13c66c6b9 WHIRLPOOL ff82b997f96a905fe404dd217252c42b29f05eeeddf3acfec1550a01adb72dbf720e0d2734539040a82f16ec8fb07892801e6aecf7c8bc132ab10ce02fd8c8e3
+AUX ttrssd.logrotated 118 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da SHA512 e56085ea83ec1f1c80edf253e315b7197f884972f6dea439958cdcf217c44592a9eac75cc96494136aaa5a8e1eae6304527ef2d144ba797716ca58ff16641019 WHIRLPOOL a5a841f269bd5b7597ff6aa51d6d7ca7c38b12f887a785670c304b4414d236a8b90c3ac8707f255425e1f4888ad8fa0bb2d199522cab947c4a74d6ba1577e7f6
+DIST tt-rss-1.5.10.tar.gz 2752801 SHA256 a80d292b85fd254d4ebe26a781a75ef696c5649cc6f702f8b3e51442c64986e7
+DIST tt-rss-1.5.11.tar.gz 2755392 SHA256 3a3edbfe59b08ea57d322bdeeb06be1970226c854691542753dc12f0fc9e876e SHA512 b4dc70ddb61c45e5b1299ee33ce674b2f2ca2c5af3f7b38a8f623cf31620ef60ef57adc78802904c4232cc8bf446eeee9950eee6c8941a15fd1362f0fbaf515b WHIRLPOOL 860ffa81b7a587978c617b431f9aa4af08b3e873d5ccd8d8afb1ee051e24abd7900e0c8da124fd1a9974e06c512346a76ab2d3e2b18ac7e7d8265b0c125cbbae
+DIST tt-rss-1.5.7.tar.gz 2808220 SHA256 5599f1f90f29c21e7e6531b74e7a40721e771fc6f1106d754923cfc1a2124264
+DIST tt-rss-1.5.8.1.tar.gz 2750347 SHA256 110f6cb6b5127e9970a02abe37022f415205abfd2c533970498ea8bc629a0bec
+DIST tt-rss-1.5.9.tar.gz 2816459 SHA256 280121f2f8fc38ff5fbd8ccf1d31f0fa7e433e57ad6f8dfffc971a1f75b0c691
+DIST tt-rss-1.6.1.tar.gz 2076221 SHA256 de193ae18b213782c1a9d530338c915921ee467a2cae85cd6911a1e46fe1b4c9 SHA512 9c1a1c8a660bee55862889b6b5c3e0dd8eb9786689a6917e15bcea454d8dccf6cd8e3833871357ccfd52b03e39b0537b583d6ab50067156d10ac7b57c1b0e13d WHIRLPOOL 485f4779b316c7364eaa76c564a4c47ef1e663e1edc183718c34300a060a21c88642a980237b9bdeef9375a24c4ff258d03bc6c0465f98ef07c2e15f21833941
+EBUILD tt-rss-1.5.10.ebuild 2160 SHA256 68a86b831be91780a375a4cdde68319652f53135dd1b16774079f5e9067567ec SHA512 05fe2561b63ff87af061ac9fb7bf471b4ceea013b50c6dac5780b488e2126bc5c1932ebc19d979a91e62b694d6537070e38d4e5a60a11be9b393b2784c4bda15 WHIRLPOOL f7b748d8dab3131fd9dc3a6e10334e3c111e5ba3022e1c69c888b4c3af1b7d7dff4603411cda3a8f1ad0eee54405a5ea60246fc34a4da53a4dae7d28b4dc2517
+EBUILD tt-rss-1.5.11.ebuild 2160 SHA256 c73906e29bda6019186d7c047ded93686a2eca4e4507858917616df2a8af2769 SHA512 5a0992e19da8a546948f4b1f9d1e00a2fcbebeed6ed60153533df4ade1014f9933371a6a3a5ab2c18fc2c9eb7c890e15df827f3b3f4d113975817a9e30852ea5 WHIRLPOOL 2db784cf3f9efd03397a3959dfa76a3d74d7cc3fe82f2839b91b779002ca97e9488dd840ec6457b2884db4595270f8027c5d600e93c1daa8067067500bba2dd5
+EBUILD tt-rss-1.5.7.ebuild 2082 SHA256 3f9b12397ef8300dae40be19018fbbbcf941ce67983e590b207e541c044b329a SHA512 f1ad880cf86e8f6d6fea2d531b94aa2259ff35f4ed0f937e639ddf7e68a39fb9767a9a6a522fe0e5049bb0145b283ae3d6ddcd58fb2e58f73689d6a7fea6c8fa WHIRLPOOL d355c4de98f0e6dc3860dbe277a49d8ff9b1b220ee09a7dc626596518f9946eee2d1f621ce69e9f94e6c1f1c657e99f3b83736b73d7ea95d763bb6ecf88a9c29
+EBUILD tt-rss-1.5.8.1.ebuild 2083 SHA256 d17bd1d2e299bd2f8d0eaef6683bc9521ebecee9b85d22f9c3ff1826a5ad2734 SHA512 5d054007b8f791a9b8cb9c326675eb2fc99f8a46b6af2dfffbfa0d84dcedb691b861c843395bb6cd8f948f066b85bd5a70de8f74b55220afaae7913e04f9b73a WHIRLPOOL 2481fd598007a6b8ae129a1ba0e32279260af65d7c4b94edd79adebb764f1b1605e165799bd23939ce8d3c455f7271361b4141d3ee885d3140c9d6bb7512e126
+EBUILD tt-rss-1.5.9.ebuild 2159 SHA256 b62a0eaf8431b7acfa9970afe578f6501331715dc782d52902ec2355630fc162 SHA512 1220c9de63087b51b72673dc74f6256c065263c2ddb4902b42b8338f21f69387a580dbb64a93177758360f6d8b3aeef6e2ba22987d77ef75a7fd1ab8b9bc46b8 WHIRLPOOL c08015e90e98f60408ac71dee132660878e979b84af7318b34d74941dd44ded856e7d442a4ea1484751351bf9b87055d715432c0e0648933e006daa6d7c5f132
+EBUILD tt-rss-1.6.1.ebuild 2133 SHA256 b3b9b36949c007889a439e7b3969dd2fbd48d7a0a71dcbfbf556fe96549ee03b SHA512 a2967cb33e6ff9ba3b3b473f71976bcea00648219d00eb66f1b6b18426692c86ba407caf9170a2f4e93209679b4fd2b3be3825c9517af4dea5e0cb20f5be3c7d WHIRLPOOL 43c504a9990f8fceaeb689e644ddd497e703691a66c445301b7f832840ceabcb00dc01916d3e2294059ae85d3037eaea7adb35dbd4c090a43ace86fad33e62a7
+MISC ChangeLog 2299 SHA256 ae377301e159e608082ad15a8cf6f78b6ab1dede91821ad82f0e03494a745650 SHA512 f800f6ae8d0efc2e10efcc2173b73410472894e6f83e8c9729c736dc98d988c60dbf6907359a97efcfb773519382195b4e081140feb9cb8a0308d8ad140cbbc2 WHIRLPOOL 491e0ca288cbbb7c9543b465a5fe1f6d71f947c31f074f1354ead2f32b847ce8d0cd3a7048f142df64f337114472f991b990b3fc306d1544bd9b624e1941b787
+MISC metadata.xml 549 SHA256 f364007d61e0c2025e3f87f542d4abf3aab20ff6bf23ebd9980ccec03c3e1352 SHA512 117d50d9c6fd6124339d8e048cd83b3f90f1139d09de0459b6d2922907c46dd35deef924ee0213cb9187bff60bad826c4854385f75d566a656ebf732aac1f4ed WHIRLPOOL 419aa948b11f06d5c65d44f3fe94f8be891a2c32b455d4a54366611868453e2f5d2c0b0a9d351526cb1a7083c618e62388e323cbcc440605d30bf233a81a01af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPvTCCAAoJEPqDWhW0r/LCEMIP/jSHmRUbU5Dx7/iN6cDMbE+a
-dMbX+y4guAOLdda24lb+MGoLs60To4ETEXXdb4yU9WilHrlXlQh/4no/WRjRE/Bt
-JgjRs9vQjNsUVlkDI8wqND8z8exHVYzosQ0wPPmrEgqFGjda/NwB8koHPICvKLsy
-gTEPMSd7K7vqlfbbaf9iaMprQFwrG/ogEl8aDjVR91BVcq83nTeRmLp+xMJkDfbx
-FA2AgFfw9LkV9AkUCStuWGCWiEmbGseIXzkOVQMlrTXEz2ivqyvN/ok4FMaUdUy4
-JDxt4QHEAryJI5g3zulfkoLH5a16AgmiKlGtauXmigJHMzSTscJiq66UPDUjPiO+
-RxSHgH8ZFPLHQoBIW8GVaABCo+nH3IusJMScSCS1mLs2vwo8W7ddaOJJ+AiKjTMj
-svfgV4FGwhaZZz1YqNB03Bh/aN1sJ9QgQm0MX6+zRX2opMLW+Ay+/P0Gog4L1MSl
-2Wh7gDjHoBFwm3A/XXV6WJ2VLKXU2bQ93b7Yzvn/eysbqa0c7UyLVFPjPck6SKo5
-S/9oIxRjcwRaG6sS0iCvFDrnQdRxVL7v+OzfswKNZX47FV7m5gtTzAHEuEWJQ+cZ
-l7tA1oVetj0R8h2I2cS/7+vF84qtzZ0hs8O38mHDH3hm7/pCQonNstCXli7JN+9q
-xQeMm0Nj9usKNFoi5Ega
-=7/Om
+iQIcBAEBCAAGBQJQvQCjAAoJEPqDWhW0r/LCSQYP/3821p3IfcQBKaMySN19AFVP
+QBYFeFHtCk1jGkbxnj+7HhMg5vP2QShmyQ9FowDr1v4UKHHnW+AgUy6/nSyGBGXE
+y9eINrFmEaUnvex2BHZhSsCn8JmKrpsqJv2KZvBPvhgrTK4y4rk5VNbokMICIci1
+YLkvfN0mwo+LSjhIpRsmxO5x47QrWxZXEWC5zxHg21jc1IJN6K7O/2Nbl1Ht7zlu
+kKpZaFXnxjtqvFe012lUXtXgwqwj44p7LYFRKVYRYEV+UKFGKNPA0wd+pX+DeaMC
+u5GIiGmWf0Fl2esvTCG5g+T0HNWudiXO1xoH06ocSYPPbwXSqDP2woHsWeH0/5nq
+cA+E3Xbq/GW2Du36z99vCpXs6OjjAtOz9TpnqkpXc3TN6UG9j7vOkn1G0ec/Whb6
+h8ETOSnSyeGO9ENn8IKFa1tbsNR+MNI42X2ZEbc1Q+y/494qbqmrSZZOBVqVPwVP
+MgZHn/AfFnkTIoS5/salC3pf1QdeoPplwpEPo94z/aNSlShQSVSl58QFXQ77LKPh
+c8WNdq5XoI+d8jS3TbksuPhCUFUQ6eAeGqvgIOp95eeaHYhJND7t5hP067lQefIZ
+IIgFMBm1WN5IxKx2NJZcvH1u7BwUXYnW07Dl73Je8rNt04CEF4oHvchWyU+i+KUv
+Eeu7hNsH7pf9oJrdCvul
+=/jeU
 -----END PGP SIGNATURE-----
diff --git a/www-apps/tt-rss/tt-rss-1.6.1.ebuild b/www-apps/tt-rss/tt-rss-1.6.1.ebuild
new file mode 100644
index 000000000000..de3157ebb4ba
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-1.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 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.6.1.ebuild,v 1.1 2012/12/03 19:42:26 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils webapp depend.php depend.apache
+
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="http://tt-rss.org/"
+SRC_URI="http://tt-rss.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="daemon mysql postgres"
+
+DEPEND=" daemon? ( dev-lang/php[mysql?,postgres?,pcntl,curl] )
+	!daemon? ( dev-lang/php[mysql?,postgres?,curl] )"
+RDEPEND="${DEPEND}"
+
+need_httpd_cgi
+need_php_httpd
+use daemon && need_php_cli
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	use mysql && require_php_with_use mysql
+	use postgres && require_php_with_use postgres
+
+	if use daemon; then
+		enewgroup ttrssd
+		enewuser ttrssd -1 /bin/sh /dev/null ttrssd
+	fi
+}
+
+src_prepare() {
+	# Customize config.php so that the right 'DB_TYPE' is already set (according to the USE flag)
+	einfo "Customizing config.php..."
+	mv config.php{-dist,} || die "Could not rename config.php-dist to config.php."
+
+	if use mysql && ! use postgres; then
+		sed -e "/define('DB_TYPE',/{s:pgsql:mysql:}" -i config.php || die "sed failed"
+	fi
+
+	sed -e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" -i config.php \
+		|| die "sed failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "/${MY_HTDOCSDIR}"
+	doins -r * || die "Could not copy the files to ${MY_HTDOCSDIR}."
+	keepdir "/${MY_HTDOCSDIR}"/feed-icons
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ttrssd.logrotated ttrssd || die "Installing ttrssd logrotate config failed."
+
+	for DIR in cache cache/magpie cache/simplepie cache/images cache/export lock feed-icons; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${DIR}"
+	done
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php
+	if use daemon; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt
+		newinitd "${FILESDIR}"/ttrssd.initd ttrssd
+		newconfd "${FILESDIR}"/ttrssd.confd ttrssd
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}