diff options
| -rw-r--r-- | www-apps/tt-rss/ChangeLog | 9 | ||||
| -rw-r--r-- | www-apps/tt-rss/Manifest | 32 | ||||
| -rw-r--r-- | www-apps/tt-rss/files/postinstall-en-with-daemon.txt | 4 | ||||
| -rw-r--r-- | www-apps/tt-rss/files/postinstall-en.txt | 4 | ||||
| -rw-r--r-- | www-apps/tt-rss/files/ttrssd.initd | 2 | ||||
| -rw-r--r-- | www-apps/tt-rss/tt-rss-1.5.4.ebuild | 52 | ||||
| -rw-r--r-- | www-apps/tt-rss/tt-rss-1.5.7.ebuild (renamed from www-apps/tt-rss/tt-rss-1.5.5.ebuild) | 13 |
7 files changed, 46 insertions, 70 deletions
diff --git a/www-apps/tt-rss/ChangeLog b/www-apps/tt-rss/ChangeLog index 23b238cee56f..294dae312811 100644 --- a/www-apps/tt-rss/ChangeLog +++ b/www-apps/tt-rss/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-apps/tt-rss # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.4 2011/11/02 21:43:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/ChangeLog,v 1.5 2011/12/04 10:53:46 hwoarang Exp $ + +*tt-rss-1.5.7 (04 Dec 2011) + + 04 Dec 2011; Markos Chandras <hwoarang@gentoo.org> +tt-rss-1.5.7.ebuild, + -tt-rss-1.5.5.ebuild, -tt-rss-1.5.4.ebuild, files/postinstall-en.txt, + files/ttrssd.initd, files/postinstall-en-with-daemon.txt: + version bump. Bug #390395. Thanks to Patrick <mail@patrick-nagel.net> 02 Nov 2011; Mike Frysinger <vapier@gentoo.org> tt-rss-1.5.5.ebuild: Drop "die" from enew{user,group} since these have always taken care of diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest index a7846cfb47d0..d63c62fe00a1 100644 --- a/www-apps/tt-rss/Manifest +++ b/www-apps/tt-rss/Manifest @@ -1,21 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 -AUX postinstall-en-with-daemon.txt 456 RMD160 527df3a1fc0cbc8a1c812441912cf29196720bb9 SHA1 0781f48d0f7a80c71361194bd91de6c2c61fec15 SHA256 e9239d433f5049500a4c6de4242a7b676535098f860b47f60ebe802c770f4c32 -AUX postinstall-en.txt 58 RMD160 b457795efe41cee2f36bbe6fa37a3eb983a9af62 SHA1 2c62f7e3e26d20fe29e12360638c767c6472caf7 SHA256 7c524c14d391c76d72b22c947b68d20321bd98de3f892b1e044c3de6c281de59 +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 1264 RMD160 c69b3f926bca00481ae02dfae78b877e756c28dc SHA1 42bccb60bac1b2a1b104814e10ed7a2a6a7933cf SHA256 0ffdada8fe96af988beb7a2eb02d9cba8c076c068dd9b6276d71bd2f3ab0224a +AUX ttrssd.initd 1269 RMD160 4277cc25cfd317fb185833ba8947bf118dae9542 SHA1 fdab7faa2b733ad8bfb03b82508b6c5cd7849084 SHA256 4894f38e59c952daf4dfcf619d5a9f5111a1d273d0f88b637a1d66bce06290b3 AUX ttrssd.logrotated 118 RMD160 f2646794119f67f365ef02dce079ab06eedf6825 SHA1 4d1e93a8df05488baf23067a983e5a70d8e4dc91 SHA256 51bfd5dc544d7fdbe90d2fea9874a0d6558d5533a1186c6fa2f797bea89342da -DIST tt-rss-1.5.4.tar.gz 3155187 RMD160 531b9894751600a1c742002b1000d55ace350b4a SHA1 3a5eb7a875e1deead8923ac2e4e27c29c43c890a SHA256 1fa4b937d094723f9f0eb9cbfe9df2f12f01acbb6beca435555c36ac9ca014ae -DIST tt-rss-1.5.5.tar.gz 3155113 RMD160 2100cae2280cdbfbea2bbe5aa19b7c65b5935278 SHA1 2ab4596cfad15f4a32947e2192343a35b55ded8c SHA256 320455edaf95d968b15cc694eb1765ce703743df8649bcb21310205786f1e26a -EBUILD tt-rss-1.5.4.ebuild 1498 RMD160 a3e630a727ac41fc7d61091d2dfcbc3f72fcceef SHA1 257b56e3e9e9ae015f8e1f9a020ccce92aa0cac0 SHA256 84b8d4584c2eac30873979ca862297c4ae612c8c386fa14210cfa25daafbfe5f -EBUILD tt-rss-1.5.5.ebuild 2064 RMD160 b0ea9a3b7636f29bb4bcfe5f8d54b116b0fbff6b SHA1 dd0bf406ff562499349032cfba42af02e016ff47 SHA256 4e7561a4a8c02cd61a0dc5ac297fb7f30cfb7a4da2e80fdf6054269d1ddfa778 -MISC ChangeLog 1055 RMD160 3c7d2630a39e76decd06209f28f0ac3821401042 SHA1 7a3a4b52fde55277b15daef9571627ba3e744350 SHA256 0166d9d15e74945fe980e89d733a4c7c75a327107bb441a09ae3205e6e7812f9 +DIST tt-rss-1.5.7.tar.gz 2808220 RMD160 9541c4b2d5f4b4cf47d0510495c04d5991addba7 SHA1 b086f52de3a6d50d111c35c0f589152e68ab6917 SHA256 5599f1f90f29c21e7e6531b74e7a40721e771fc6f1106d754923cfc1a2124264 +EBUILD tt-rss-1.5.7.ebuild 2082 RMD160 6a6a128b5d2e35d296e315a76d0842acb969bd79 SHA1 5a956816d10130b9f6b14053f7aad33536afd558 SHA256 fe05f06aefc15ea8626df675c7ae299b4253cf5878f324616ee03cf85f11609e +MISC ChangeLog 1366 RMD160 1bcb0f23e2534de19acaa6e39c901b9f34b71ff2 SHA1 047466b2e66f06a35d0c8b053c8863a0e400d1de SHA256 89aa30a098f27b8f9974f251204967b9750e2e10722589f1ef23f5db10ffa902 MISC metadata.xml 600 RMD160 f28a3381f580fd54605e04dae0a94b2c6e226313 SHA1 3a49081d4f1fb9dc266447a620cb57febfa7f2bf SHA256 7e8210281dc50b9c310f0598740e99c89d59fa4c3fca92f5335a7681c7dfe02f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6xuYAACgkQaC/OocHi7JbrcAEAlKDuSAa+0nwbDGcCmU4d49HJ -wEWUAx/DesOaFAcZXWEA/0Dy+3amedh1v0tEcRrAXCiLken63/YOgUmiUB1XT57f -=LfL6 +iQIcBAEBCgAGBQJO21E7AAoJEPqDWhW0r/LC6ngP/R0qC4G6+VCcb8yvZ9uuPWo6 +97+UYkzaIoVnMqW1DHRgu56ghPTaJ0TyRaLU/fjMHnd/FB51opk7J9R8kCNftVas +3HwFoCgDaxKx5KSHqf4p7PAk7TjEG3wQOBzYTNV09zzzMDP4r/BKyU3HU1ih2ODX +dBFugu9g914nV5O7eKkMKAAjA+BmYko3swh3Zdp4ZVdgtymg1GQ13vzkA2wylTYD +ZKIW8lfEKXm/Ndbl0fC0f3MmZY3dKpmF31Z9O80ak3BgwIuhG3uM7/a950pDr/HL +4nzFY01GPLStGAtTIO2qcfsBM7iTgy7rmbhkENu7FS9i79fXL4blPQLW1eHb2lRq +nDJG3FPRbo2keh1trTxPNG2lKOah9dtHZ8+MJaskrKqZFrUSTMdYABPK19gzYwoi +G20vhapPCbNzj7ETjncoILKrUXXNz7956Dvz56yG2LcJhyxFDkCV19DyLBkjuFBQ +eK+LJUWVVj5WBSRkGPYPDr1g5Yhv6kMqtCM/seQZvDJdPzftJVEwA2/319L6gMvB +zgIFd9ZnwYUbj1k/oddn7spf+vFjd9J1wvqHXB2WdN/jQ5Z0l+BXtT6MJrsh2vdi +dYjwGhslwEz5hDmf7VJzZu9iXZ3ddk3CNDjWQb79v4mntOHzXSNBHmBKSwzlEKnw +o9hsKVBrZreUc+MHV5Aw +=Isw+ -----END PGP SIGNATURE----- diff --git a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt index ff5544c042c5..34476f671f4e 100644 --- a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt +++ b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt @@ -12,3 +12,7 @@ so that it gets launched after a system restart: rc-update add ttrssd default + +Note on update from 1.5.6 or earlier: The directory containing the +feed icons has been renamed from 'icons' to 'feed-icons'. Please +move your *.ico files over, and then remove the old 'icons' dir. diff --git a/www-apps/tt-rss/files/postinstall-en.txt b/www-apps/tt-rss/files/postinstall-en.txt index 369d5e03dc27..77423cae900d 100644 --- a/www-apps/tt-rss/files/postinstall-en.txt +++ b/www-apps/tt-rss/files/postinstall-en.txt @@ -1 +1,5 @@ Please read http://tt-rss.org/trac/wiki/InstallationNotes + +Note on update from 1.5.6 or earlier: The directory containing the +feed icons has been renamed from 'icons' to 'feed-icons'. Please +move your *.ico files over, and then remove the old 'icons' dir. diff --git a/www-apps/tt-rss/files/ttrssd.initd b/www-apps/tt-rss/files/ttrssd.initd index f3496389c42d..5a1a18942290 100644 --- a/www-apps/tt-rss/files/ttrssd.initd +++ b/www-apps/tt-rss/files/ttrssd.initd @@ -19,7 +19,7 @@ start () { # Since I have no idea how I could do this during the webapp-config installation, # lets do it during start up... - for DIR in cache cache/htmlpurifier cache/magpie cache/simplepie lock icons; do + for DIR in cache cache/htmlpurifier cache/magpie cache/simplepie lock feed-icons; do chgrp ttrssd "${INSTANCE_DIR}/${DIR}" chmod g+w "${INSTANCE_DIR}/${DIR}" done diff --git a/www-apps/tt-rss/tt-rss-1.5.4.ebuild b/www-apps/tt-rss/tt-rss-1.5.4.ebuild deleted file mode 100644 index 40994b2fb35d..000000000000 --- a/www-apps/tt-rss/tt-rss-1.5.4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2011 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.5.4.ebuild,v 1.1 2011/07/03 12:37:42 hwoarang Exp $ - -EAPI="2" - -inherit 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="mysql postgres" - -DEPEND="dev-lang/php[mysql?,postgres?]" -RDEPEND="${DEPEND}" - -need_httpd_cgi -need_php_httpd - -pkg_setup() { - webapp_pkg_setup - use mysql && require_php_with_use mysql - use postgres && require_php_with_use postgres -} - -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}"/icons - - webapp_serverowned "${MY_HTDOCSDIR}"/icons - webapp_configfile "${MY_HTDOCSDIR}"/config.php - - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_src_install -} diff --git a/www-apps/tt-rss/tt-rss-1.5.5.ebuild b/www-apps/tt-rss/tt-rss-1.5.7.ebuild index 2dda0126edfa..4e74473e2343 100644 --- a/www-apps/tt-rss/tt-rss-1.5.5.ebuild +++ b/www-apps/tt-rss/tt-rss-1.5.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.5.5.ebuild,v 1.2 2011/11/02 21:43:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.5.7.ebuild,v 1.1 2011/12/04 10:53:46 hwoarang Exp $ EAPI="2" @@ -23,8 +23,10 @@ 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 require_php_with_use pcntl enewgroup ttrssd @@ -36,9 +38,11 @@ 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" } @@ -48,14 +52,15 @@ src_install() { insinto "/${MY_HTDOCSDIR}" doins -r * || die "Could not copy the files to ${MY_HTDOCSDIR}." - keepdir "/${MY_HTDOCSDIR}"/icons - + 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/htmlpurifier cache/magpie cache/simplepie lock icons; do + for DIR in cache cache/htmlpurifier cache/magpie cache/simplepie 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 |