From: Brian Evans Date: Sat, 2 May 2015 03:12:37 +0000 (+0000) Subject: Revbump to update EAPI, fix DEPEND and eliminate the unnecessary re-building of the... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f6bc599c8aa28890c0e6309e765ac4058bc0fccd;p=gentoo.git Revbump to update EAPI, fix DEPEND and eliminate the unnecessary re-building of the documentation which is present in the archive Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6 --- diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog index 89c728b120a5..1892aaf9ae0c 100644 --- a/www-apps/davical/ChangeLog +++ b/www-apps/davical/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for www-apps/davical # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/ChangeLog,v 1.8 2015/02/14 02:13:24 mjo Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/ChangeLog,v 1.9 2015/05/02 03:12:18 grknight Exp $ + +*davical-1.1.0-r1 (02 May 2015) +*davical-1.1.1-r2 (02 May 2015) +*davical-1.0.2-r2 (02 May 2015) +*davical-1.1.3.1-r2 (02 May 2015) + + 02 May 2015; Brian Evans +davical-1.0.2-r2.ebuild, + +davical-1.1.0-r1.ebuild, +davical-1.1.1-r2.ebuild, + +davical-1.1.3.1-r2.ebuild, -davical-1.0.2-r1.ebuild, -davical-1.1.0.ebuild, + -davical-1.1.1-r1.ebuild, -davical-1.1.1.ebuild, -davical-1.1.3.1-r1.ebuild: + Revbump to update EAPI, fix DEPEND and eliminate the unnecessary re-building + of the documentation which is present in the archive *davical-1.1.3.1-r1 (14 Feb 2015) diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest index 9be5b360657e..c7bdfed0840e 100644 --- a/www-apps/davical/Manifest +++ b/www-apps/davical/Manifest @@ -6,33 +6,32 @@ AUX awl_location.patch 1156 SHA256 67a0bc37c10a2468919e647953766b8121009c0f3d0eb AUX inc_path.patch 1418 SHA256 b0f4544639ce76b3cdcd032854bb94178580e12dd51cb9d8d5d6a1f29747a138 SHA512 f5f4019322627d32a1fa34251bc5cb5788103ff8048c11c000f034db3118154dd193fd510721cc664e6c492c23331fa2c13dbcddd00c00197dec9d63c4196fd3 WHIRLPOOL cf77f8a9f16b45a2e72c4589ccb1be65a387bab18d8a370c7b0efed289e462960cbf4db5348766e8ff632ceef3d97d1bdeb059e09224dbd87e03a0b8f721840b AUX postinstall-en.txt 730 SHA256 a8796e92aace5307fa6911a3019cd2f1f4baefb5bd4b90efedda5793967ceed1 SHA512 e77199c7978bf44f96b82dee6d7cf22e4a964f2bd48c17890add7ec0742a5f4c3a296bcb813f6ac79059e8b98b5c155a0846b00c3622ea708f6baf3895270de4 WHIRLPOOL 9c87177121fb9929201754ea84ba2a435c2b388a796473a35440f09c7f1b6c033f230423ecbb8acf9fdd8c2b9717acf9d2f72b2bcce136fb27d619f5f79d1a48 AUX vhost-example 366 SHA256 3d1609ff3652814c00aeb33effdfca48a60698b8b5da4db7f97951807235b333 SHA512 a2fde5ad64445aee0936a4fe2c608f48ec8163c46949cccd98c1b36b548e769477d387fb82e065b6dade5277580ad43426264ce13dca614182db16a4951247b9 WHIRLPOOL 357e068c6f5fe1f785f130698fbb8ad530c154d13c5260e13dd3cd3cd8df50bc9eeb69ee1011953e482465bfbe7494b9b344fa7143128e2ec3f9b9f8da545b68 -DIST davical-1.0.2.tar.gz 2739740 SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6 +DIST davical-1.0.2.tar.gz 2739740 SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6 SHA512 8eb1df963b0e3aa87c28e75001c4301698abff74fd4581bdc826bfad8d8e1cd5aa0b641c668dbecc2f85ca8f3bca8ec9a508d268881da004cbb84017c2604dcb WHIRLPOOL 92c3e127659a818290f5d46b1c5818719174b0aee8a4f0b8e29f1ad39022d62b22f5840036d7ec6497c40dd05935ee37a7eba478e179e0baa5abc3723e392aa6 DIST davical-1.1.0.tar.gz 2967572 SHA256 cc52f09c1f8706aa2b6d598b77ef0997b6e7ee31db1f1325864d705514505816 SHA512 5c272418b5c324d0ea4cbdd9c1124171ecd1fe1f3df4953569b02a47359469539205ff48e92aa19abaa667bb7c69f1b8b8196d79e549645009ac0b7bbddd7c18 WHIRLPOOL e224f62c4143d5c92387a346ec1ff14504b7892308d302a3f50d749725c58b8edbc23642640cd29b85e4095b4e3352242ccc25657cd4193f13e191a0ac894a24 DIST davical-1.1.1.tar.gz 2979425 SHA256 09bd92a35d2730fe687f6801796d8da1090cb8e36c2910c056a01b00cb73cafc SHA512 6f0b2a13ba6698ea1a7d16988c795888820a08d125ac3d622b6c9fc21f831b698e8ce2c9c7ae25e64252f38502e473daabbd0626c5b2450646efb7cdb7f5b31e WHIRLPOOL 82e1a3530dd2247d46effd2df13554d3af2f2141d3c5efb7eb3cc1d514f8defc7a479ff47d135872ef712ae63d6a39ba4d65df14c2885ab2ca7b6510e6db23bf DIST davical-1.1.3.1.tar.gz 3031220 SHA256 4439c2df0052241b65c61eb4f0b10c406d93afd65a5cc6b523b597c0a7b05c15 SHA512 1944c4750799e9388adcaf1d5df6a2a5daccc34dd7274673a6b27cf0c32b2357d3cdd6d7c0928ea182408ce5111530f6b0e2eb6d882eb47ee1dcfa6eb8d4fe4b WHIRLPOOL d32252bef2c5f4d772a7d0744d8d6aaabbde2de2f3e259802c80242e5f87ecf5ed4ea965daa2c5ec134c214c46bbbfc1e234fcdbb23f507f6de1ed328d9f6934 -EBUILD davical-1.0.2-r1.ebuild 1932 SHA256 27cab00332541242be435289c2a7c48c1e1440040f0c7879644de42698af5f9a SHA512 96df7de2bd55fee680240b0eb12c0c116772703a203b7e48e80e888eb704372d42ad50f7dc2905caad7fb2d09bb175e8a70e17f84e3cb9f1eefd1cb95ba8670c WHIRLPOOL ca3930ae94af5ff5c82fa8480bfd06183976a6a69103e67b297c9b2a0be535e59988d8770c8a9b081f1763cd0e8f7c5f55113e643798efd48a0cd06243a4c98a -EBUILD davical-1.1.0.ebuild 1929 SHA256 f6990a16b38e05170c68a2638c58e6c8cbfb770a911e0bc366629c772da8d2b4 SHA512 a75dfb91c2b9cca45a662248cc7d619f3eb93437a04151c039117286f295a8612ae6ead3b243337b43c5bbdb1eae83f6ddc18bcdd95539a0795d5ada8f180164 WHIRLPOOL f1958772d093e55dc0811e2c6821a25388a808bc614932cbe157ce4c8c7096303ce81c3fd3021a3758c86e0e94a1b2db6a780a37b67f554d6a8af2704ffa022b -EBUILD davical-1.1.1-r1.ebuild 1931 SHA256 0f0367c4e7556218775c35dfad1fa2ff161831c2902958b76a42e4b56a5073d6 SHA512 c527db34f527fea0ec4b9391206921a549786e16f8dd30bb76e45bbf9e13c3d2354ab91e3212e8a057f2402ffa4a0cbad25cbb7b48b4cc40e39e19a073768eeb WHIRLPOOL afdfe571b2b95e1cf6d78b314d07ef17045859e78cd5f3a7f03cdc5ce387c1a682f0b4b23689449ad112dd61c709f2e6ffda8ed1d484e5beab668237ee179db8 -EBUILD davical-1.1.1.ebuild 1929 SHA256 7e40fd51f11dee0fc5fcab6a3df20c586de9890f85f8a5fa29f580f6322151f6 SHA512 29516e9304c44195a442f485f266366b1ed642b2218641564e8a9786dd87628c194e413ac3b8a5d11cf7c4accb1d630e6b694efa3314f65c85c12d6578eda59e WHIRLPOOL 3536d244d7672817e059946b4d0ab59a16160328a32e822f93e53c54a0f82744df504a7add5827074acae49ead19d2f64baaf6e84ab1a86bdd82b9fd1d139768 -EBUILD davical-1.1.3.1-r1.ebuild 1871 SHA256 58a46cb906d6b109fa4783ebb8c109de311822aee92b7a23ef5594202049ec3f SHA512 e7ff613cf5fb661e3586c7bf743b7e25aae7a8ea9e921cef4503838ac5c2dd3aa1e9fb05d3943d9b98496ead21d307b518f64597b2a1cf8920ef6ddf94efbafd WHIRLPOOL 386a4cffe12a102c8a36546e8f6e8c895a38ed964073ad845001dbc9aacba9786b8a817a72a6cf6bdd240c2b02c5d0ed4e1d5a7ae984bd3321ee65c1533c4526 -MISC ChangeLog 6813 SHA256 dd2e71849b1638504709925f3c11f09681cb6e6a373d84c1fc5dc35a3f258259 SHA512 c312266c966c07d3bc4b64c623f8c3687f4edca5b7595a3c4ddb8cf2e0a4fd8ff3525639a71257072782b1d3f5b9f2467f24974dcd3e85670362ffdaf7485751 WHIRLPOOL 81279b897ed34f70ea346168d935dafa3d3c5252ae5af1c5f908b4e66619b8cdf16251a5f3c0f0659619191647aaae3f03ddb3a6425d343000cee8b503fc7839 +EBUILD davical-1.0.2-r2.ebuild 1659 SHA256 ae9d755e495b4fbf3d0c13ea0445d1d03291de68c1a072087a023ad8bd57f80a SHA512 73244a6952ad08e922451e3fbc5a3ae5a47fbf4c54eda9554ca747d2f8fe6fd2d0a30ccd6829b15977781ba34cedd8022acb4f3007e84a29793d96b3b44e5524 WHIRLPOOL db195ed5c57f5dac01ca95fc17f41ea01cd4b3f0009016ad7496afe63ae07885f753f812fac6d347dc7a588a72c6571fe21ff0c883bed599971354a90e59f0a3 +EBUILD davical-1.1.0-r1.ebuild 1639 SHA256 ad799feed79165791a2f197011490d776616a3fc5c96a469768be57b786acc77 SHA512 cbefe7bc43961615521655a113424c1767a5c3f8c294a72a43f69b0b38e4cba76aa9be3766bd62cc2fd68a574efc947cd81c693965425977f3a4afc2720e125f WHIRLPOOL 14d85a8d4a32b4ed7ce0325b444ca507d9e660c13f08d585381c042b0fe656fee2eb0574b0d1f4b00c7baa815037341de2e3929b078a472a240a93fd937e12a4 +EBUILD davical-1.1.1-r2.ebuild 1634 SHA256 ba47a34ce5e7b2c60c90dacf85696d30ab16d2a8b264aa3d906ac2dab9931db0 SHA512 4f4e3304e987338a31e8e62d8b2cda3ad2de8953f4dd7c2b9bc830fa6ea540a8e741c865b5d17c56f370fb5ad55c48e8a947854d3f6ddb075dfac62bf31c4b9e WHIRLPOOL 8e685ecfa8c70e5626f3833f081da29f1aced7e35059f55f6069c6ae6bc253984f75ac9e086b0099cedf62f3aed4be140fec2956348a867b120f9ce7553fe48f +EBUILD davical-1.1.3.1-r2.ebuild 1704 SHA256 dd930e97c15875a5ceb2249d6a931774514bbd640ee2ea68e95cf71d6f4ef7f6 SHA512 6fe66af5ae49a701329be1b4c9fd2fd265376ba874594c2a2c90738253bd901c54649cdc93fb69ae17e09e0901de3d44335efb9497dc37665fe909b7e9d5b38e WHIRLPOOL 96fe79c6a0d93deac06621537cc058262f6352449abc9560e49cab9940456f085fb4d489db96e43b7166c2c2f6ae9afebabd786ab70838337972b27ddfc75578 +MISC ChangeLog 7371 SHA256 604efeeef8726c4988ee15e6eeeca5229fa6e5af6351bc49520b044824012f7b SHA512 7ee54b0fd4bbfff65ac919d0dbb1eff0b888c3193000065ea98b95d09ba6e2d498d3102af41a00d754fd91d4f568361338f074614dc361fb747a9933b6e29459 WHIRLPOOL d565025f24a1303e1812710a943bdda12c46368c2483391f6e90bf3842d89a9ca3d1a28b3b04218767dfd72e3e0dbaf86c864776496756dda1171641ded45f90 MISC metadata.xml 275 SHA256 780dae37784989c8c166e00f8a13a1b256c67feb87657016b93db3cec4e755a8 SHA512 c69320f94e1ceecb9199120795acf4ffddb6e972a63f53db1d6dca49449b5f1734b320dbea6fc097edceabc5fed17cf18cef6a917451cbe5e447dd87f8ac3e6e WHIRLPOOL fe8c08375133fe403a057b4499e2c988bfb517193263edfe351abb33ede09cd30a16008cc968886c814230ca61baac2cbbae4e0efbd308f7d0f6abe66590f1be -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJU3q9IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2 -RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrblrgP/iInspqCfyzC93PNoTvd5vOm -fRlOC9SdZIeqTuIPemQ0HQoEpclxpTziIIOvJQwZvjV7im7EIEIC5DT3QgzLMhk7 -Udrl5asmMbZcoC1CV/1yKQOlP2/CtbQSIhWea5NX3l30JNrpFdU+XVaTENMRW5p/ -UvnZMIwB4ucdwjN6zKb4RQk9QMuCcDJn8nPiAAka7jIGp8e+oKE1UY/jxRDll1ye -h/buRP7dfzJ3cPfomEWK5dMiQcPtxPsR2BnYjtK3U1bU5acPJIwnHluixhzL/AmD -ThUCGNf5xXWFhN3sETicf7hQnP1PEJ7RsVFw8X+UCCOE2lw5E46ZWo5mdb5rCEe3 -huWabku/BbvKQE04vFRIe5HKVxembxo7t7J3OSSm+ObXWfyzAT3ismp3o6C2Xj7a -w6MiNBNWxZk7EtXfrRF/ac2wAeJs0Pov46qQIsx6tjm6hHrj3zlnn5/48qbX5cVW -QWdhLJMNWtUZV3EDxij/P7v7Pt3qKWYLp4uvcvioUatMQ3UeuAVksOFaoC7A1AB0 -GyioZ1+N/0pdzHK5/tFAkFb8saPTNwzgYy7dmZHygQKsE6NVrMcIcQEKqp8VtxEL -/7KB4ElMGZnguRfbkidpNU6RkW3GLFyLnbAho/c5LodTqEsr/Q4YDJ9fy+kQW6zp -M+O85ChXmowMyohqZXPR -=2MuV +iQJ8BAEBCABmBQJVRECeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE +MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2y8gP/jmknRP4vqZXrOO/WF1NYAxf +sBtTUEXMBs22Lwe/8WfAT1mFLYruHlLQh3Sacp7wtJ2ZijB4C54qd6BWLt8EN6M/ +fUlVJ8akYMHtlEpdVal/XBRVj4mukkCk/5HLJU/59S43E3i0tQjO4g9YDMcLyp9/ +Ad+6NlEMC6VkqMh7oOCCQ5GxfTGWhbPtGwqSSt6HHlp4Rjsiy8ciq6IkDs2BOugI +NzUL02KZa1V2D5Ng4/ErSSGF/mIXA5E9TPvozuKRmqpyDfYGu9rTE2Q54/nmnj2S +3KoX+eszXDG4EXmtQj0tMFPxZfp+3WLfACNc+HT0LVOcy+9B7p3lcZsthrQuFpoI +U9U/Z/CHZVEYSR7/Y3403kOZl72DXwiGSC8owAN/81NjUne/cMLYS6boIDAQugq5 +Rcr1BlWluks+d1Nc/Ao1hNDDILtbBqrE4hT2EvsxQDa8IXhBkm2Y5h9GSF21DOGo +WZ9VkZWeQnNq7MbdG0vstPN9eOYI5NwdyfzPR0FkARJrL97MStHWUJLcqTPQjcmu +/oBpr53cd4PNi3YWL1SGq1J3WTfedVF4cNNZWP2YkrI4UYEoK7qFFocu7JH8n5dL +OP5vnap/1DJ1jHS0VgTDw790m1Pa4kB+/3yvvw94kmo9V0mYPIl8VFnFBWo6q+tH +wreVNHvZdYWd5Et1c2xj +=u9EJ -----END PGP SIGNATURE----- diff --git a/www-apps/davical/davical-1.0.2-r1.ebuild b/www-apps/davical/davical-1.0.2-r2.ebuild similarity index 63% rename from www-apps/davical/davical-1.0.2-r1.ebuild rename to www-apps/davical/davical-1.0.2-r2.ebuild index f4949b1e4d6d..bf3908720216 100644 --- a/www-apps/davical/davical-1.0.2-r1.ebuild +++ b/www-apps/davical/davical-1.0.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.0.2-r1.ebuild,v 1.1 2012/03/14 06:46:26 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.0.2-r2.ebuild,v 1.1 2015/05/02 03:12:18 grknight Exp $ -EAPI=2 +EAPI=5 inherit depend.php webapp @@ -14,9 +14,11 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" IUSE="doc" -DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" -RDEPEND="app-admin/pwgen - dev-lang/php[calendar,curl,pdo,postgres,xml] +DEPEND=">=dev-php/awl-0.51 + sys-devel/gettext" +RDEPEND=" + app-admin/pwgen + dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml @@ -32,24 +34,18 @@ src_prepare() { } src_compile() { - if use doc ; then - einfo "Generating documentation" - phpdoc -q -c "docs/api/phpdoc.ini"\ - || die "Documentation failed to build" - fi - emake built-po || die "emake failed" + emake built-po } src_install() { webapp_src_preinst dodoc-php INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog \ - || die "dodoc failed" + testing/README.regression_tests TODO debian/changelog einfo "Installing web files" insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess || die "doins failed" + doins -r htdocs/* htdocs/.htaccess einfo "Installing main files and i18n" insinto "${MY_HOSTROOTDIR}/${PN}" @@ -58,16 +54,15 @@ src_install() { einfo "Installing sql files" insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* || die "doins failed" + doins -r dba/* if use doc ; then einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ || die "dohtml failed" + dohtml -r docs/api/ docs/website/ fi insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" \ - || die "newins failed" + doins config/* "${FILESDIR}/vhost-example" webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" webapp_src_install diff --git a/www-apps/davical/davical-1.1.0.ebuild b/www-apps/davical/davical-1.1.0-r1.ebuild similarity index 62% rename from www-apps/davical/davical-1.1.0.ebuild rename to www-apps/davical/davical-1.1.0-r1.ebuild index 7f1deca5a3cb..296e36541936 100644 --- a/www-apps/davical/davical-1.1.0.ebuild +++ b/www-apps/davical/davical-1.1.0-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.0.ebuild,v 1.1 2012/06/26 09:39:33 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.0-r1.ebuild,v 1.1 2015/05/02 03:12:18 grknight Exp $ -EAPI=2 +EAPI=5 inherit depend.php webapp @@ -14,9 +14,12 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" IUSE="doc" -DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" +DEPEND=" + >=dev-php/awl-0.51 + sys-devel/gettext + " RDEPEND="app-admin/pwgen - dev-lang/php[calendar,curl,pdo,postgres,xml] + dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml @@ -32,42 +35,35 @@ src_prepare() { } src_compile() { - if use doc ; then - einfo "Generating documentation" - phpdoc -q -c "docs/api/phpdoc.ini"\ - || die "Documentation failed to build" - fi - emake built-po || die "emake failed" + emake built-po } src_install() { webapp_src_preinst dodoc-php INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog \ - || die "dodoc failed" + testing/README.regression_tests TODO debian/changelog einfo "Installing web files" insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess || die "doins failed" + doins -r htdocs/* htdocs/.htaccess einfo "Installing main files and i18n" insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r inc locale || die "doins failed" + doins -r inc locale rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die einfo "Installing sql files" insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* || die "doins failed" + doins -r dba/* if use doc ; then einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ || die "dohtml failed" + dohtml -r docs/api/ docs/website/ fi insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" \ - || die "newins failed" + doins config/* "${FILESDIR}/vhost-example" webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" webapp_src_install diff --git a/www-apps/davical/davical-1.1.1-r1.ebuild b/www-apps/davical/davical-1.1.1-r2.ebuild similarity index 62% rename from www-apps/davical/davical-1.1.1-r1.ebuild rename to www-apps/davical/davical-1.1.1-r2.ebuild index 59daf954c6fd..e4088223566e 100644 --- a/www-apps/davical/davical-1.1.1-r1.ebuild +++ b/www-apps/davical/davical-1.1.1-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.1-r1.ebuild,v 1.1 2013/01/28 08:16:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.1-r2.ebuild,v 1.1 2015/05/02 03:12:18 grknight Exp $ -EAPI=2 +EAPI=5 inherit depend.php webapp @@ -14,9 +14,10 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" IUSE="doc" -DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" +DEPEND=">=dev-php/awl-0.51 + sys-devel/gettext" RDEPEND="app-admin/pwgen - dev-lang/php[calendar,curl,pdo,postgres,xml] + dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml @@ -32,42 +33,35 @@ src_prepare() { } src_compile() { - if use doc ; then - einfo "Generating documentation" - phpdoc -q -c "docs/api/phpdoc.ini"\ - || die "Documentation failed to build" - fi - emake built-po || die "emake failed" + emake built-po } src_install() { webapp_src_preinst dodoc-php INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog \ - || die "dodoc failed" + testing/README.regression_tests TODO debian/changelog einfo "Installing web files" insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess || die "doins failed" + doins -r htdocs/* htdocs/.htaccess einfo "Installing main files and i18n" insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r inc locale || die "doins failed" + doins -r inc locale rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die einfo "Installing sql files" insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* || die "doins failed" + doins -r dba/* if use doc ; then einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ || die "dohtml failed" + dohtml -r docs/api/ docs/website/ fi insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" \ - || die "newins failed" + doins config/* "${FILESDIR}/vhost-example" webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" webapp_src_install diff --git a/www-apps/davical/davical-1.1.1.ebuild b/www-apps/davical/davical-1.1.1.ebuild deleted file mode 100644 index 8da033fec83e..000000000000 --- a/www-apps/davical/davical-1.1.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.1.ebuild,v 1.1 2012/07/17 07:21:43 patrick Exp $ - -EAPI=2 - -inherit depend.php webapp - -DESCRIPTION="A CalDAV and CardDAV Server" -HOMEPAGE="http://davical.org/" -SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )" -RDEPEND="app-admin/pwgen - dev-lang/php[calendar,curl,pdo,postgres,xml] - dev-perl/DBI - dev-perl/DBD-Pg - dev-perl/yaml - >=dev-php/awl-0.51 - www-servers/apache" - -need_php5 -need_httpd - -src_prepare() { - epatch "${FILESDIR}/awl_location.patch" - epatch "${FILESDIR}/inc_path.patch" -} - -src_compile() { - if use doc ; then - einfo "Generating documentation" - phpdoc -q -c "docs/api/phpdoc.ini"\ - || die "Documentation failed to build" - fi - emake built-po || die "emake failed" -} - -src_install() { - webapp_src_preinst - - dodoc-php INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog \ - || die "dodoc failed" - - einfo "Installing web files" - insinto "${MY_HTDOCSDIR}" - doins -r htdocs/* htdocs/.htaccess || die "doins failed" - - einfo "Installing main files and i18n" - insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r inc locale || die "doins failed" - rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die - - einfo "Installing sql files" - insinto "${MY_SQLSCRIPTSDIR}" - doins -r dba/* || die "doins failed" - - if use doc ; then - einfo "Installing documentation" - dohtml -r docs/api/ docs/website/ || die "dohtml failed" - fi - - insinto /etc/${PN} - doins config/* "${FILESDIR}/vhost-example" \ - || die "newins failed" - - webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt" - webapp_src_install - - fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh" - fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database" -} diff --git a/www-apps/davical/davical-1.1.3.1-r1.ebuild b/www-apps/davical/davical-1.1.3.1-r2.ebuild similarity index 80% rename from www-apps/davical/davical-1.1.3.1-r1.ebuild rename to www-apps/davical/davical-1.1.3.1-r2.ebuild index b238d46cb5a4..e4ca79bfd88c 100644 --- a/www-apps/davical/davical-1.1.3.1-r1.ebuild +++ b/www-apps/davical/davical-1.1.3.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.3.1-r1.ebuild,v 1.1 2015/02/14 02:13:24 mjo Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/davical/davical-1.1.3.1-r2.ebuild,v 1.1 2015/05/02 03:12:18 grknight Exp $ EAPI=5 @@ -14,15 +14,15 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" IUSE="doc" +DEPEND=">=dev-php/awl-0.55 + sys-devel/gettext" RDEPEND="app-admin/pwgen - dev-lang/php[calendar,curl,pdo,postgres,xml] + dev-lang/php:*[calendar,curl,pdo,postgres,xml] dev-perl/DBI dev-perl/DBD-Pg dev-perl/yaml >=dev-php/awl-0.55 virtual/httpd-php" -DEPEND="${RDEPEND} -doc? ( dev-php/PEAR-PhpDocumentor )" S="${WORKDIR}/${PN}.git" @@ -36,20 +36,13 @@ src_prepare() { src_compile() { emake built-po - - if use doc ; then - einfo "Generating documentation" - phpdoc -q -c "docs/api/phpdoc.ini"\ - || die "Documentation failed to build" - fi } src_install() { webapp_src_preinst dodoc-php INSTALL README debian/README.Debian \ - testing/README.regression_tests TODO debian/changelog \ - || die "dodoc failed" + testing/README.regression_tests TODO debian/changelog einfo "Installing web files" insinto "${MY_HTDOCSDIR}"