diff options
author | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-05-14 10:06:08 +0000 |
---|---|---|
committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-05-14 10:06:08 +0000 |
commit | 72101c64ecccff3006142b9a898ac83acd475a34 (patch) | |
tree | 106353c89caca44521a6c3af8d45dada5e928e09 | |
parent | 2016-05-14 09:43:42 UTC (diff) | |
parent | profiles/package.mask: drop dev-haskell/extra:0 mask (removed package) (diff) | |
download | gentoo-72101c64ecccff3006142b9a898ac83acd475a34.tar.gz gentoo-72101c64ecccff3006142b9a898ac83acd475a34.tar.bz2 gentoo-72101c64ecccff3006142b9a898ac83acd475a34.zip |
Merge updates from master
-rw-r--r-- | dev-haskell/extra/Manifest | 2 | ||||
-rw-r--r-- | dev-haskell/extra/extra-1.46.1-r1.ebuild | 44 | ||||
-rw-r--r-- | dev-haskell/extra/extra-1.46.3.ebuild | 48 | ||||
-rw-r--r-- | dev-haskell/extra/metadata.xml | 8 | ||||
-rw-r--r-- | dev-python/uranium/uranium-2.1.0_beta-r2.ebuild (renamed from dev-python/uranium/uranium-2.1.0_beta-r1.ebuild) | 2 | ||||
-rw-r--r-- | eclass/java-utils-2.eclass | 37 | ||||
-rw-r--r-- | net-analyzer/cacti-spine/Manifest | 1 | ||||
-rw-r--r-- | net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild | 49 | ||||
-rw-r--r-- | net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch | 11 | ||||
-rw-r--r-- | net-analyzer/cacti/Manifest | 1 | ||||
-rw-r--r-- | net-analyzer/cacti/cacti-0.8.8h.ebuild | 60 | ||||
-rw-r--r-- | profiles/package.mask | 6 |
12 files changed, 148 insertions, 121 deletions
diff --git a/dev-haskell/extra/Manifest b/dev-haskell/extra/Manifest index d8ca418a77a7..536d1f0aaf11 100644 --- a/dev-haskell/extra/Manifest +++ b/dev-haskell/extra/Manifest @@ -1,4 +1,2 @@ -DIST Extra-1.46.1.tar.gz 19066 SHA256 e95b5bfcc770fc9f54edcf002055690537df7763cd5d78ba190c5660b438f235 SHA512 cf222ccac42e899d6af75980e30e46a6ea41217174262060b41972cb9925f54f15f71050055731f5978c44d7c0eb0d2e32b45e153130b11656590cc132f719b6 WHIRLPOOL 0dc1842de0ab87d9cfdbd98d15582609028c74f0fbc954693404e9c134e6d804cc2a523621288bd88041a9c4cb9c4af3358a60a7e4f07c961d62594181705700 -DIST Extra-1.46.3.tar.gz 19186 SHA256 d0fb7267853f610a9b9e7d5e37ab39f6de2b99f21c15d44bffb6807459babcf6 SHA512 63fad1f1da19303019859e9fa13076068f817a507f7c74e5d1f7fb3f51d54434d6714702c2ce76539b322513cda4c97bd3cd366fb4a028def400e947aa39e6c8 WHIRLPOOL 9f5e4f85c4aa3dccce07c71dffc911055685b0c0b76b13c5fdb8466a965c31ab49287d7d513e39a382f6b420b299bc76871dda0490495ffd7f56c2b70a494da0 DIST extra-1.3.1.tar.gz 30439 SHA256 94c8cc02b530e589171d2e0520afac066994a1cb48cd4c847496387489230dfa SHA512 d6e736a021ee39139855516647b91a328e8ff075b94bdcc84c1296586d9f58a20819fcf78a45bd0fc9b3e9516780c68fb27ec0dc406964b6d9d5c93e26bfc9c5 WHIRLPOOL f8d02f3cd149f3d1dd5e30a5411f3359a2e4590061856f8f0350e63b4baafa961ade1ca142696dd1b1db97dc7ec35dc5481e836a4eaaf62803f55cf66b40caac DIST extra-1.4.2.tar.gz 31311 SHA256 0ea699d56bb08ad6e70ee6aaa2069326c2bc76ac347c0f04e94ce38cf3ec30c1 SHA512 5d0c5ee70d51fa4d132b5e7813908a65badbf339cfcae4182932933b70cb7b8faf659d22c624086757c38973aeff769b5175bf533bbb51c3ec419ba09bb28409 WHIRLPOOL f8090b12f6412d9a15b115cad88b760053844549e5132a2def334f2ced98c51d3e87d45786bdaa55c862bcafea054211c4d2f3bea81f134b0c8e60a3f81c89c6 diff --git a/dev-haskell/extra/extra-1.46.1-r1.ebuild b/dev-haskell/extra/extra-1.46.1-r1.ebuild deleted file mode 100644 index 9c3daecfe41d..000000000000 --- a/dev-haskell/extra/extra-1.46.1-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -MY_PN="Extra" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A grab bag of modules" -HOMEPAGE="http://src.seereason.com/haskell-extra" -SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/bzlib:=[profile?] - dev-haskell/hunit:=[profile?] - dev-haskell/mtl:=[profile?] - >=dev-haskell/network-2.4:=[profile?] - dev-haskell/network-uri:=[profile?] - dev-haskell/puremd5:=[profile?] - =dev-haskell/quickcheck-2*:2=[profile?] - dev-haskell/random:=[profile?] - dev-haskell/regex-compat:=[profile?] - >=dev-haskell/unixutils-1.51:=[profile?] - dev-haskell/zlib:=[profile?] - >=dev-lang/ghc-6.12.1:=" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-0" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - cabal_chdeps \ - 'network >= 2.4' 'network >= 2.4, network-uri' -} diff --git a/dev-haskell/extra/extra-1.46.3.ebuild b/dev-haskell/extra/extra-1.46.3.ebuild deleted file mode 100644 index 551557e39da5..000000000000 --- a/dev-haskell/extra/extra-1.46.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.4.6.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -MY_PN="Extra" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A grab bag of modules" -HOMEPAGE="https://github.com/ddssff/haskell-extra" -SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+network-uri" - -RDEPEND="dev-haskell/bzlib:=[profile?] - dev-haskell/hunit:=[profile?] - dev-haskell/mtl:=[profile?] - dev-haskell/old-locale:=[profile?] - dev-haskell/old-time:=[profile?] - dev-haskell/puremd5:=[profile?] - >=dev-haskell/quickcheck-2:2=[profile?] <dev-haskell/quickcheck-3:2=[profile?] - dev-haskell/random:=[profile?] - dev-haskell/regex-compat:=[profile?] - >=dev-haskell/unixutils-1.51:=[profile?] - dev-haskell/zlib:=[profile?] - >=dev-lang/ghc-7.4.1:= - network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] ) - !network-uri? ( >=dev-haskell/network-2.4:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2 -" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag network-uri network-uri) -} diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml index b9cbd5036f75..7bcf2b68f1eb 100644 --- a/dev-haskell/extra/metadata.xml +++ b/dev-haskell/extra/metadata.xml @@ -5,13 +5,7 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> - <longdescription> - A hodge-podge of functions and modules that do not have a better home - </longdescription> - <use> - <flag name="network-uri">use network-uri package</flag> - </use> <upstream> - <remote-id type="github">ddssff/haskell-extra</remote-id> + <remote-id type="github">ndmitchell/extra</remote-id> </upstream> </pkgmetadata> diff --git a/dev-python/uranium/uranium-2.1.0_beta-r1.ebuild b/dev-python/uranium/uranium-2.1.0_beta-r2.ebuild index 4a0e83b4bfe8..50c5a48c0f2a 100644 --- a/dev-python/uranium/uranium-2.1.0_beta-r1.ebuild +++ b/dev-python/uranium/uranium-2.1.0_beta-r2.ebuild @@ -21,7 +21,7 @@ IUSE="doc test" RDEPEND="${PYTHON_DEPS} dev-libs/libarcus:*[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg] dev-python/numpy[${PYTHON_USEDEP}] dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5" diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 65e7197ef427..9e0d2d561a30 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -348,8 +348,10 @@ java-pkg_dojar() { #but first check class version when in strict mode. is-java-strict && java-pkg_verify-classes "${jar}" - INSDESTTREE="${JAVA_PKG_JARDEST}" \ - doins "${jar}" || die "failed to install ${jar}" + ( + insinto "${JAVA_PKG_JARDEST}" + doins "${jar}" + ) || die "failed to install ${jar}" java-pkg_append_ JAVA_PKG_CLASSPATH "${JAVA_PKG_JARDEST}/${jar_basename}" debug-print "installed ${jar} to ${D}${JAVA_PKG_JARDEST}" # make a symlink to the original jar if it's symlink @@ -493,9 +495,11 @@ java-pkg_doso() { if [[ -e "${lib}" ]] ; then # install if it isn't a symlink if [[ ! -L "${lib}" ]] ; then - INSDESTTREE="${JAVA_PKG_LIBDEST}" \ - INSOPTIONS="-m0755" \ - doins "${lib}" || die "failed to install ${lib}" + ( + insinto "${JAVA_PKG_LIBDEST}" + insopts -m0755 + doins "${lib}" + ) || die "failed to install ${lib}" java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}" debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" # otherwise make a symlink to the symlink's origin @@ -724,8 +728,10 @@ java-pkg_dosrc() { done # Install the zip - INSDESTTREE=${JAVA_PKG_SOURCESPATH} \ - doins ${zip_path} || die "Failed to install source" + ( + insinto "${JAVA_PKG_SOURCESPATH}" + doins ${zip_path} + ) || die "Failed to install source" JAVA_SOURCES="${JAVA_PKG_SOURCESPATH}/${zip_name}" @@ -825,7 +831,10 @@ java-pkg_dolauncher() { echo "source /usr/share/java-config-2/launcher/launcher.bash" >> "${target}" if [[ -n "${target_dir}" ]]; then - DESTTREE="${target_dir}" dobin "${target}" + ( + into "${target_dir}" + dobin "${target}" + ) local ret=$? return ${ret} else @@ -864,9 +873,11 @@ java-pkg_dowar() { fi # Install those files like you mean it - INSOPTIONS="-m 0644" \ - INSDESTTREE=${JAVA_PKG_WARDEST} \ + ( + insopts -m0644 + insinto "${JAVA_PKG_WARDEST}" doins ${warpath} + ) done } @@ -2323,14 +2334,14 @@ java-pkg_init_paths_() { JAVA_PKG_NAME="${PN}-${SLOT%/*}" fi - JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}" + JAVA_PKG_SHAREPATH="/usr/share/${JAVA_PKG_NAME}" JAVA_PKG_SOURCESPATH="${JAVA_PKG_SHAREPATH}/sources/" JAVA_PKG_ENV="${D}${JAVA_PKG_SHAREPATH}/package.env" - JAVA_PKG_VIRTUALS_PATH="${DESTTREE}/share/java-config-2/virtuals" + JAVA_PKG_VIRTUALS_PATH="/usr/share/java-config-2/virtuals" JAVA_PKG_VIRTUAL_PROVIDER="${D}/${JAVA_PKG_VIRTUALS_PATH}/${JAVA_PKG_NAME}" [[ -z "${JAVA_PKG_JARDEST}" ]] && JAVA_PKG_JARDEST="${JAVA_PKG_SHAREPATH}/lib" - [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}" + [[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="/usr/$(get_libdir)/${JAVA_PKG_NAME}" [[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps" # TODO maybe only print once? diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest index 6024bed5578a..66db427a67d1 100644 --- a/net-analyzer/cacti-spine/Manifest +++ b/net-analyzer/cacti-spine/Manifest @@ -1,3 +1,4 @@ DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232 DIST cacti-spine-0.8.8g.tar.gz 805321 SHA256 f7d60d5663f6fe8f730363763f31d110589c725e482c943f0f8287359a6db533 SHA512 24d208b4779e5d04e0206e950c0d49d0453937b3da4a3e3bdbb1a075bdf22db3c6bb6789bab92f6c22a67c39745a36fc98cb28371423469b87a5936b3afb3ba3 WHIRLPOOL d1106b59748ac166c0b44ffdad285c3efefb03fec98318704e16022bf788168603884ee1b4bd22d9ef5fb962c5a60bfda241c6675b987fe9c02c7c4068213ad2 +DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild new file mode 100644 index 000000000000..9ff9158b929b --- /dev/null +++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +MY_P=${PN}-${PV/_p/-} + +DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" +HOMEPAGE="http://cacti.net/spine_info.php" +SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" + +CDEPEND=" + dev-libs/openssl:* + net-analyzer/net-snmp + virtual/mysql +" +DEPEND=" + ${CDEPEND} + sys-apps/help2man +" +RDEPEND=" + ${CDEPEND} + >net-analyzer/cacti-0.8.8 +" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-0.8.8h-fix-ac-macro.patch \ + "${FILESDIR}"/${PN}-0.8.8d-mysql.patch \ + "${FILESDIR}"/${PN}-0.8.8d-ping.patch \ + "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch + + sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am + AT_M4DIR="config" eautoreconf +} + +src_install() { + dosbin spine + insinto /etc/ + insopts -m0640 -o root + newins spine.conf{.dist,} + dodoc ChangeLog README +} diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch new file mode 100644 index 000000000000..3f497ac7bce5 --- /dev/null +++ b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -10,7 +10,7 @@ + AC_LANG(C) + + AM_INIT_AUTOMAKE(spine, 0.8.8h) +-AM_CONFIG_HEADER(config/config.h) ++AC_CONFIG_HEADERS(config/config.h) + + # static libraries + AC_ARG_WITH(static, diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index 913fb15fc46c..ccc05f635c17 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -1,3 +1,4 @@ DIST cacti-0.8.8e.tar.gz 2594446 SHA256 43b091957faf03a4b0baacc8c327320394c0843476ea34e3beb1416506ad3f55 SHA512 11eeace353b7bacb2e4f065b1557b6978f0315d372f03f25bbdd210aaa494b70661b24502885bb610d8cf042cdcd68c69ea1a6fd1cb7073af29553116500df0c WHIRLPOOL ea5f29a71504f4e1fb4d8981db84b46fb87842921d8f6f422b8a0c2b127e80b785fca60b3b037036396cf9de456240a573cd446118f03a93f25a2406fe22be40 DIST cacti-0.8.8f.tar.gz 2594409 SHA256 2ea92407c11bf13302558a5bc9e1f3a57bd14a1d9ded48c505ec495762f76738 SHA512 b712a9f8b7bee632cb4982fed72793ac2f4d70aa042784bbd2fd3923a27901f457393aa95bbd63960187e85fe462c35e88fa3cd93e8537a3a68f94bdbf5d7f2b WHIRLPOOL 58c883780fed833df2501b204a21fc8605e76a7b5ac26ebd13f0bf22f45dda6363be35ada8af2a65f4e7db506d103b6739d73699676c1622e7051eb8a89ad555 DIST cacti-0.8.8g.tar.gz 2584879 SHA256 3187bd5054ae4e54496bb23187f14c79a441fedcfd397a2d27cd60179f0dee33 SHA512 cbac69de47a32de8b87d0fc2f32e90eb70f7f13828fd17764957b5afbbcc7a8954ccc49f30f414d5fdf09142967a9ddcb4cde66d03569407ae05fc36612b731c WHIRLPOOL 47633f00e8875f98d80806cb0743b817030c487a3c62ede453e73125f87c210c320820c92df95555227e32148ff8271c8760c504955a683d6affadda73846213 +DIST cacti-0.8.8h.tar.gz 2585226 SHA256 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 SHA512 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f WHIRLPOOL 250ee38d969c9a7d9a71b15a25e48c2b9b22412c6c2394798d178172d9a1be056b009b328594559524adbd47ad05032992b13cb5a632af1a23f947fb55342402 diff --git a/net-analyzer/cacti/cacti-0.8.8h.ebuild b/net-analyzer/cacti/cacti-0.8.8h.ebuild new file mode 100644 index 000000000000..3c9a4a9b9b6f --- /dev/null +++ b/net-analyzer/cacti/cacti-0.8.8h.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils webapp + +# Support for _p* in version. +MY_P=${P/_p*/} + +DESCRIPTION="Cacti is a complete frontend to rrdtool" +HOMEPAGE="http://www.cacti.net/" +SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="snmp doc" + +need_httpd + +RDEPEND=" + dev-lang/php[cli,mysql,session,sockets,xml] + dev-php/adodb + net-analyzer/rrdtool[graph] + virtual/cron + virtual/mysql + snmp? ( >=net-analyzer/net-snmp-5.2.0 ) +" + +src_prepare() { + sed -i -e \ + 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \ + "${S}"/include/global.php || die + + rm -rf lib/adodb || die # don't use bundled adodb +} + +src_compile() { :; } + +src_install() { + webapp_src_preinst + + rm LICENSE README || die + dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} + use doc && dohtml -r docs/html/ + rm -rf docs + + edos2unix `find -type f -name '*.php'` + + dodir ${MY_HTDOCSDIR} + cp -r . "${D}"${MY_HTDOCSDIR} + + webapp_serverowned ${MY_HTDOCSDIR}/rra + webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log + webapp_configfile ${MY_HTDOCSDIR}/include/config.php + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + webapp_src_install +} diff --git a/profiles/package.mask b/profiles/package.mask index 31a1bd8ec177..c3d39a9da3b6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -314,12 +314,6 @@ media-libs/ethumb media-libs/evas x11-plugins/echievements -# Sergei Trofimovich <slyfox@gentoo.org> (19 Jan 2016) -# Mask broken package. Exposes badly designed API -# that can't be transparently used in ghc-7.8 and -# ghc-7.10, bug #561122 -dev-haskell/extra:0 - # Andreas K. Hüttel <dilfridge@gentoo.org> (9 Jan 2016) # Errorneously added. Is already in perl-core. Please uninstall. dev-perl/ExtUtils-Constant |