diff options
Diffstat (limited to 'dev-util/buildbot')
-rw-r--r-- | dev-util/buildbot/Manifest | 16 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-0.9.10.ebuild | 2 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-0.9.11.ebuild | 2 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-0.9.12.ebuild (renamed from dev-util/buildbot/buildbot-0.9.8.ebuild) | 36 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-0.9.4.ebuild | 216 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-0.9.7.ebuild | 193 | ||||
-rw-r--r-- | dev-util/buildbot/buildbot-9999.ebuild | 8 | ||||
-rw-r--r-- | dev-util/buildbot/files/Remove-distro-version-test.patch | 21 |
8 files changed, 57 insertions, 437 deletions
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index 8a84d528d93d..2ec290579ef1 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -1,3 +1,4 @@ +AUX Remove-distro-version-test.patch 804 SHA256 ba232a084d776b20cfe3a25b7438b4f26af3bf4abbfaa7a28ef954b46056b2bf SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe WHIRLPOOL a94c6ae199704ee464cee507cfa394f3f414679caf9b33ba004c30e3621695c87717641661e010a4adedd29c46398bce272414eafc053f9716917be21ada573f AUX buildbot-0.9.4.docs.patch 4619 SHA256 25e802ba82315e6f62b536e0002d7af8b6b6c814803d9f142cd70f4aa4e5b815 SHA512 c521b44c9db5d565302bf611842d1b607f240ba89988aacc4d988aa61626be125a5b20a7cc2135fb6e331a50f5de3fc6ba7fe0e5f5a42049700eea46f9cc1c8d WHIRLPOOL 3bead12e5d510d225ad3b8f4070c5d6d206287391c6c5262ae2573123bd1e2e33a214c56e0f88d223cd3df77b04221fb60016e50666ef277c0eab0de76084a40 AUX buildbot.service 435 SHA256 a94170eaac47b72e3fe86eb3fa3e231c2977940fa77b84ab0736a20a7e68639d SHA512 0baf2696efe3843c93f90c4678696ffe1c7d5df2292b5b3ee48a4e30bf213956052f4772c8e7938f541c08c76b39157b246debf376f9fa26a8773be785cddeab WHIRLPOOL bd2802cc78c5a6a6672e8e84c1330c641911c31bc802be222b9e4c87e3be5ca9115f18e90f3a48012619f7e3bbaf9fddaa0af333526aa034b4d0eae2cd9256f8 AUX buildmaster.confd 218 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840 WHIRLPOOL 0e258348e5882db063e95b3c508f8d92e2a7598e5f76705da2ebba45b4893ae893b0ed67271a112255d3e5b8f5f1ace17b487fc885db30a774dde44be1944c4d @@ -8,17 +9,12 @@ AUX buildmaster_at.service.conf 150 SHA256 4056f0bf8713ca26e64cd8d3eb6c570156a2e DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8 DIST buildbot-0.9.10.tar.gz 3112750 SHA256 8c5ed75f3f16f4ff0f2c9e3f9b091acb5e6e1c0ef68ffa8f687a55413a833143 SHA512 95b489d5f7d0bc00ae5f71cd056b36fe689c4dc9408a7a0e4b1b45e036c9074832c8e3755981520a8c85a791b50f7f40765962c12a71887198dc0bbd0140d0e0 WHIRLPOOL 8d62d0aecdea4122709693ce48c72d5dbac2e946a6923a7ea41842dc759369a678e21a8abb0b4ff825e1ba559a9d490bcc4ff56fc5568a4f7f2d94b4f6c5f027 DIST buildbot-0.9.11.tar.gz 3096455 SHA256 9be352c0aab5d1520fedac8d6b19aadda4f48763ac7f72bb00e5f8cc51107ee8 SHA512 c68a657213b0f878d8c2b4e6ebe18cfc9b3e19a4eecaf085fd3e5631bbb78dc9bd14e6b3d4b576e78eb1631329c86331371200a350d33696204fb76e7beae81c WHIRLPOOL 3b1804d7920e110ca1ae1d04e7a7c38fef0db4a2c7b448a21175a0f2693ba8725d228d27720ffdad976071d143e4158b41dc527d120e2c4928df3fdbd765285f -DIST buildbot-0.9.4.docs.tar.xz 69224 SHA256 69fc33762a885568b02c42954a64d62d28bcb750b3aed011c3da8a9f84c13371 SHA512 906e551e0db32c8a0b4010b3b8b00c4776e3d1b7d7381e4dc0ccf01d361184e4605c3ab0ecaf4e42207bd73c3e72f8a570a4d4c29db72f4d68241abf48741d7e WHIRLPOOL 95f263e0b9ab22a649118f362d866b08cbdf62511f2a1f9bd6a7265103f174e35d0c8d86ad6a3b7dd5fd0b4277d60dbd25801c5e6f7e414e7fa634c241dae987 -DIST buildbot-0.9.4.tar.gz 3020851 SHA256 068161cd9ada10b87f40117c768a37ce796ebf5e7bf08f224f4c7ded88cd7472 SHA512 938a94192560b989a277d9650c50781d7e7c116bc5e2010ccb2e655df757de0ee254369531b2f432c835c0285c724e52d999a393d0ce1b104d4b9dcc5c6687da WHIRLPOOL 0ffe61b82ee93b78cdb3cb74ef96d5a3547e0fcab9ec8093b59a7212c5e2a1ad16eff046306bffcc0ea63b2e0bf2df1e54b5a0874dc78e27744db2088ccac804 -DIST buildbot-0.9.7.tar.gz 3092434 SHA256 8fcbf0e6536e5d60407f59d14f96d5f8386cd91846a4fa47b4336d71551a9e33 SHA512 3fd2b488cabac37e297bb1a475cdb115f261324a22ec4d6fbcf8dc5bfb6ee135fab3763998433be8795581d476f69e2adb6f42d248bf2131a42eecfc1667202a WHIRLPOOL 427d4c1c452f767550a3d2731b2e34480c399dcf50e57d4fb69f0a350f381e3e7ecc47d712fc8fbb99afcf8b230c7bd3afe8437ec3b24bf9ddbf7d35b4d1caad -DIST buildbot-0.9.8.tar.gz 3101418 SHA256 39a2f7df458ec9be1009cf90a02d732d142a2ec3fbc0404e4f3fce4b8a4c3af7 SHA512 88800bad542d26aee6df348021faf5f76f36c250e9fb85c9abe3af7f13ec87fcae5727c8633772205f5c024709fd39b05d1d9c3aa1374b4ca72a528b5ec3ba83 WHIRLPOOL fafb46f6d6bc10f6073567cd6a6894cd67d61c4ff537b342060319874eb22ea45d816f6b764f0b9f841f9b7a5e127481a85dbb4abbacd228a8168a5e3e948b2b +DIST buildbot-0.9.12.tar.gz 3057832 SHA256 0e8a75059dd8d04112ae77391b979432a3b5efb6e80ec60bbe110d8d9d983835 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d WHIRLPOOL 0e29078f6d67c1996c6fa389790d3c89dbdd13f6926882df16286a33b95e275b6436865815d225d1b243a1cfefe4948ebcaa2700ee7a003b449ccac4a32b62e7 EBUILD buildbot-0.8.12-r3.ebuild 5490 SHA256 ab180e34963560c3a14df8a5f00f451bb469c25c37bf29a211e5c02eaf8bde24 SHA512 16e5f6ba87559ed9788f4cb7451020cfd0e3b2efe22f5126aca23d0b6e20b9ed6050e4dada0e9e595b28f8ddf4e5446c1217c2e77adfd44dc307fc0b8b5b654a WHIRLPOOL d01753e023dadfc3155308bbf9b41a1d1eea03a57d2ba6a5640989e3491977007dd7fe37ca072c1676dbe87b4a920ae294573770baaf53913f39ed5552108f73 -EBUILD buildbot-0.9.10.ebuild 7279 SHA256 bac78fde783e5642abb90ad826409209c4159cced413c7caa1ef374956d23e7c SHA512 6de67b6cf11bff7e21cedd159d6d253fb083cdf2094611410d94a0514d409849d1d8913e5e3ed18f2ca227d3acf2fd1f19e6fccaf31566c8d971ccd278a7e0e7 WHIRLPOOL 128616ff39de2340d10ec6f7f63d42780645c7a014c691172d1b942f030ea353ef03536e3690386ac1fbdc67755cd1962f6ac50d5f83114285c16071062662de -EBUILD buildbot-0.9.11.ebuild 7053 SHA256 425c5dc4f36d6df2fc5cab17bc5dbad951658b012e8d983d95a286c926877ed3 SHA512 34ff2a130e1a2f44b570667db0ccc7acb1216a873a75491712d1cb3a8ca82a5dd1c081f42837f7ee23b69265298a3889467d646ed0d3fb7b944a38bf40bbb6fc WHIRLPOOL a906335ab4f067047516573c5c72243612a57a55f340f9a0ed1639ea430a3ebd8e89099c2ca14abc33fd95a1d25337666fccb45e8bbefdc36aa6d915ef8e1502 -EBUILD buildbot-0.9.4.ebuild 7076 SHA256 088566d6e59150e1bfbcbfd12a19168b43f9dc420da601ee7e27005c2d6ad299 SHA512 1f5a6fc87fbf5403090c2d573476a910b4b557babac8857512f27458cdf97844a47931884dcbf59eba646b45d8d0408ae15a41ef6eaa42ae0e86c9a0e9af6831 WHIRLPOOL 086a8b5108286ac8de15da37ab8959e76cf922bf2183225c41b5e9c327ec3ab0073339ab6272fc896f48f60488f3659cac5a2772f371a6dd6adb03270c9968d6 -EBUILD buildbot-0.9.7.ebuild 6682 SHA256 52d651cf20b067e0036bf70ba221ba4408d3c33b65c93a9cd2bec9f6d1c8608b SHA512 708ccb2387de7ee61f9c92f8c8a15d8cb39f67a2a161ef57fbecfb9debf5107d35515b7d4c84b6bfea7fbf3ec84b7096797416236ed9d9014958913ed77f631a WHIRLPOOL 45a86a824882a2c87b4a66c8c9b1975889247c1c7c969ea686066646b55917b04a4702755641e40aaf33917b892fde94a847aa5b5f83a5614e7c5d1b8801ef14 -EBUILD buildbot-0.9.8.ebuild 6730 SHA256 44bcdd947b81c7019ba92e7f715949e2b5b339022c3d399dcb772d18df136c83 SHA512 9e3a590fdb60ce3f5d3f24e62bbc3d245c9af9a7d858d69a984c461abb7eb07335ef6a00058987b1f944bef9c6604d129071227df7093e027c625a819856884c WHIRLPOOL 4033eed24f1e5f178810f3aac5781b78ed613ff4a1e9c1c34c9d9fadefa086c5b422f1c1724b2eb9fa2a80560ff3b3c8d73086b0d7f4eb1b76cce413bc064529 -EBUILD buildbot-9999.ebuild 7053 SHA256 425c5dc4f36d6df2fc5cab17bc5dbad951658b012e8d983d95a286c926877ed3 SHA512 34ff2a130e1a2f44b570667db0ccc7acb1216a873a75491712d1cb3a8ca82a5dd1c081f42837f7ee23b69265298a3889467d646ed0d3fb7b944a38bf40bbb6fc WHIRLPOOL a906335ab4f067047516573c5c72243612a57a55f340f9a0ed1639ea430a3ebd8e89099c2ca14abc33fd95a1d25337666fccb45e8bbefdc36aa6d915ef8e1502 +EBUILD buildbot-0.9.10.ebuild 7272 SHA256 a08e34f4a80d5020ee49f9c742876f05888bb592dbace092286ee5b3bcd6d749 SHA512 173da10076a2a58772abf009cce729a8ea1e7e85a5f5e5ecf46f6220ef60cafc8252c88ab8129479c41e0e3606454921d6da79d925ef6e64cce575db043ae730 WHIRLPOOL 74ac9a1c40907e7db4baf8b24988ae0789f66046f863c1f3d9ef01369f7d0c017549ad53699414fede9738c08c6fa0102984f45a46c25ec9d67a4c898d5085b4 +EBUILD buildbot-0.9.11.ebuild 7046 SHA256 53883db3f3a6255d3568bab66b58f905251982d88fcf3315ed844e27566ab252 SHA512 72223002dc2774a5316623a5e7bc17ba780311af0dcad7766534c4728ab339b87620e0e6285be9aa87cdd076e5f77dba4ba9b66b1395881fc60341140a1ab6d9 WHIRLPOOL 80618630aa08367274b3b2091dff261430fb732ca88fc06c7f91a66fbdf856dbe55d0049992b7664854a85394be20df9a951da7c412fbe4b4b531a419fc55353 +EBUILD buildbot-0.9.12.ebuild 7107 SHA256 822c2885c4df40017bf67a957d12840bb97f2fa1279e32b8db60d172545e8df9 SHA512 0dfd907b7cb5e07ce59ab22664ea535c3010c20602503ff9dddd9c54c2031cde0eef89a5c22fd053fd89e4e3581f174ae21789ffaac45d646442f51e0aa2523f WHIRLPOOL 191595c0b39d63a70596ddd667cd230de7c6765b0c0fa119e6ad6352cee03d25f011050b2cb10c90014829f0ddf9f15e44205e1f8deac12321d87c2482f553e8 +EBUILD buildbot-9999.ebuild 7046 SHA256 8e01dba1d45eb16a702060658f157703bd61c528accfd44dc08ddab4d434b3e1 SHA512 af5e730d60d886e74b59789dd64fcf1025b92f880ebeb54b4e74bb410e441977fb5fe58e2f5737caed8a1cda4420cd0c131524fdf54f2dc1976206b7c3de2be1 WHIRLPOOL 294d26d58339cdce362b0a76d03237ee507d4a57ea3516c7f5a3b4494748a83dc1e0d7d47e360e33a526b67664c76b5aed21f6c6133b566f4bebdf2c4889468e MISC ChangeLog 8474 SHA256 f17f98b73101e0c7ef4a57d9de67201ec8cb2e13dad90e31c9ebb4b22d3e8a47 SHA512 a86c113f5d2921f2077e3f69f599255e91ecdf31d4f04965881d7f3167c53084b4178a0dc3c87be499dce7b715b97ec7336aa9f24dbb97f0108a33d337bc6234 WHIRLPOOL 3003bee799a0509b76bd33d855f9addf2433ab05ae2fcc160a50b9a4f4c1974c9f76293bdcea45548b017df2f74c90064ddb8bf347685da5540b2f657ccd376f MISC ChangeLog-2015 23687 SHA256 01b29df49e2d44ead407b455fc3fdb5746b6a07fed70c6b91935490c4816200b SHA512 6b6a9680134503958352c40c3ca9ca3acde081b77cedab97e6eccbcba6716cf68101d592bcfcd4bbed226cd038d79d1b20d34e1532a63e30687d04b0e4bad00d WHIRLPOOL 45de95ee421fae3b3052d57e90bfdc49de53c1cafc185d12b0280873cd113bc0432ec253e0ed1e40fea0824c1f261f3907c3c78b9bf53ff147e935c970150952 MISC metadata.xml 1543 SHA256 204ee06fb9b996162310b5404f2d7edbd3cf12d773f67ae1ce446cd5c207bfc7 SHA512 a5bd8e8b9fe253e2a4bb43c536dc9b0fdccca675d5381ba7f488d1127c73805838ce881b691f8c638f774706c4b025cd5b70145b10d6c3578b68399e1fcb628d WHIRLPOOL 2c9191bb2c0d125c008042702adc70b39ae82105a84c8afc373b37a3e3790fab791d8aac29bf005f6af871085842e6b3a23e4a7a0bd691f24610b2ac3052b644 diff --git a/dev-util/buildbot/buildbot-0.9.10.ebuild b/dev-util/buildbot/buildbot-0.9.10.ebuild index 0f493ccb8ffc..ec293dba8932 100644 --- a/dev-util/buildbot/buildbot-0.9.10.ebuild +++ b/dev-util/buildbot/buildbot-0.9.10.ebuild @@ -121,7 +121,7 @@ src_install() { if use examples; then insinto /usr/share/doc/${PF} - doins -r docker docs/examples + doins -r docs/examples fi newconfd "${FILESDIR}/buildmaster.confd" buildmaster diff --git a/dev-util/buildbot/buildbot-0.9.11.ebuild b/dev-util/buildbot/buildbot-0.9.11.ebuild index 694b31c8f116..e0acf382b491 100644 --- a/dev-util/buildbot/buildbot-0.9.11.ebuild +++ b/dev-util/buildbot/buildbot-0.9.11.ebuild @@ -112,7 +112,7 @@ src_install() { if use examples; then insinto /usr/share/doc/${PF} - doins -r docker docs/examples + doins -r docs/examples fi newconfd "${FILESDIR}/buildmaster.confd" buildmaster diff --git a/dev-util/buildbot/buildbot-0.9.8.ebuild b/dev-util/buildbot/buildbot-0.9.12.ebuild index 7ab416edb5b3..1db6439d370b 100644 --- a/dev-util/buildbot/buildbot-0.9.8.ebuild +++ b/dev-util/buildbot/buildbot-0.9.12.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" PYTHON_REQ_USE="sqlite" PYTHON_COMPAT=( python2_7 python3_5 ) @@ -29,12 +29,18 @@ IUSE="crypt doc examples irc test" RDEPEND=" >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] + >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] + dev-python/pyjwt[${PYTHON_USEDEP}] + >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] + ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] crypt? ( - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt] + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] dev-python/idna[${PYTHON_USEDEP}] dev-python/service_identity[${PYTHON_USEDEP}] @@ -42,13 +48,6 @@ RDEPEND=" irc? ( dev-python/txrequests[${PYTHON_USEDEP}] ) - dev-python/future[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] @@ -80,6 +79,10 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} [[ ${PV} == *9999 ]] && S=${S}/master +PATCHES=( + "${FILESDIR}/Remove-distro-version-test.patch" +) + pkg_setup() { enewuser buildbot @@ -113,7 +116,7 @@ src_install() { if use examples; then insinto /usr/share/doc/${PF} - doins -r docker docs/examples + doins -r docs/examples fi newconfd "${FILESDIR}/buildmaster.confd" buildmaster @@ -127,7 +130,6 @@ src_install() { python_test() { distutils_install_for_testing - export TEST_HYPER=1 esetup.py test || die "Tests failed under ${EPYTHON}" } @@ -164,6 +166,8 @@ pkg_postinst() { pkg_config() { local buildmaster_path="/var/lib/buildmaster" + local log_path="/var/log/buildmaster" + einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." einfo "Press Control-C to abort." @@ -172,6 +176,8 @@ pkg_config() { [[ -z "${instance_name}" ]] && die "Invalid instance name" local instance_path="${buildmaster_path}/${instance_name}" + local instance_log_path="${log_path}/${instance_name}" + if [[ -e "${instance_path}" ]]; then eerror "The instance with the specified name already exists:" eerror "${instance_path}" @@ -189,6 +195,12 @@ pkg_config() { ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ || die "Unable to create link to init file" + if [[ ! -d "${instance_log_path}" ]]; then + mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" + fi + ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ + || die "Unable to create link to log file" + einfo "Successfully created a buildmaster instance at ${instance_path}." einfo "To change the default settings edit the master.cfg file in this directory." } diff --git a/dev-util/buildbot/buildbot-0.9.4.ebuild b/dev-util/buildbot/buildbot-0.9.4.ebuild deleted file mode 100644 index 4ee67e152c9c..000000000000 --- a/dev-util/buildbot/buildbot-0.9.4.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python2_7 ) - -EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" - -inherit readme.gentoo-r1 user systemd distutils-r1 - -MY_PV="${PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot build automation system" -HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot" -SRC_URI=" - mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz - https://dev.gentoo.org/~dolsen/distfiles/buildbot-0.9.4.docs.tar.xz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="crypt doc examples irc mail manhole test" - -RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] - || ( - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] - ) - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] - crypt? ( - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - ) - irc? ( - dev-python/txrequests[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] - ) - ) - mail? ( - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] - ) - ) - manhole? ( - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] - ) - ) - dev-python/future[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - doc? ( - >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] - >=dev-python/docutils-0.8[${PYTHON_USEDEP}] - dev-python/sphinx-jinja[${PYTHON_USEDEP}] - dev-python/ramlfications[${PYTHON_USEDEP}] - ) - test? ( - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - || ( - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - ( - >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] - ) - ) - dev-python/moto[${PYTHON_USEDEP}] - dev-python/boto3[${PYTHON_USEDEP}] - dev-python/ramlfications[${PYTHON_USEDEP}] - dev-python/pyjade[${PYTHON_USEDEP}] - dev-python/txgithub[${PYTHON_USEDEP}] - dev-python/txrequests[${PYTHON_USEDEP}] - )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${MY_P}.tar.gz - cd ${MY_P} - unpack buildbot-0.9.4.docs.tar.xz -} - -pkg_setup() { - enewuser buildbot - - DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added - to support starting buildbot through Gentoo's init system. To use this, - execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. - The scripts can run as a different user if desired." -} - -python_prepare_all() { - if use doc; then - epatch "${FILESDIR}/buildbot-0.9.4.docs.patch" - fi - distutils-r1_python_prepare_all -} - -src_compile() { - distutils-r1_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null - EPYTHON="python2.7" emake html - popd > /dev/null - fi -} - -src_install() { - distutils-r1_src_install - - doman docs/buildbot.1 - - if use doc; then - dohtml -r docs/_build/html/ - # TODO: install man pages - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r contrib docs/examples - fi - - newconfd "${FILESDIR}/buildmaster.confd" buildmaster - newinitd "${FILESDIR}/buildmaster.initd" buildmaster - systemd_dounit "${FILESDIR}/buildmaster.target" - systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service" - systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service" - - readme.gentoo_create_doc -} - -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" - ewarn " rc-update add buildmaster.myinstance default" - ewarn " /etc/init.d/buildmaster.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildmaster@myinstance.service" - ewarn " systemctl enable buildmaster.target" - ewarn " systemctl start buildmaster.target" - elog - elog "Upstream recommends the following when upgrading:" - elog "Each time you install a new version of Buildbot, you should run the" - elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." - elog "This will add files and fix (or at least detect) incompatibilities between" - elog "your old config and the new code." - fi - elog - elog "In order to create a new instance of buildmaster, execute:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config() { - local buildmaster_path="/var/lib/buildmaster" - einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildmaster_path}/${instance_name}" - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - local buildbot="/usr/bin/buildbot" - if [[ ! -d "${buildmaster_path}" ]]; then - mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" - fi - "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" - chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" - mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ - || die "Unable to create link to init file" - - einfo "Successfully created a buildmaster instance at ${instance_path}." - einfo "To change the default settings edit the master.cfg file in this directory." -} diff --git a/dev-util/buildbot/buildbot-0.9.7.ebuild b/dev-util/buildbot/buildbot-0.9.7.ebuild deleted file mode 100644 index b82986878383..000000000000 --- a/dev-util/buildbot/buildbot-0.9.7.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python2_7 python3_5 ) - -EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo-r1 user systemd distutils-r1 - -MY_PV="${PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot build automation system" -HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot" -[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi - -IUSE="crypt doc examples irc test" - -RDEPEND=" - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] - crypt? ( - >=dev-python/twisted-17.1.0[${PYTHON_USEDEP},crypt] - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - ) - irc? ( - dev-python/txrequests[${PYTHON_USEDEP}] - ) - dev-python/future[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - doc? ( - >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] - >=dev-python/docutils-0.8[${PYTHON_USEDEP}] - <dev-python/docutils-0.13.0[${PYTHON_USEDEP}] - dev-python/sphinx-jinja[${PYTHON_USEDEP}] - dev-python/ramlfications[${PYTHON_USEDEP}] - ) - test? ( - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/moto[${PYTHON_USEDEP}] - dev-python/boto3[${PYTHON_USEDEP}] - dev-python/ramlfications[${PYTHON_USEDEP}] - dev-python/pyjade[${PYTHON_USEDEP}] - dev-python/txgithub[${PYTHON_USEDEP}] - dev-python/txrequests[${PYTHON_USEDEP}] - dev-python/lz4[${PYTHON_USEDEP}] - dev-python/treq[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - )" - -S=${WORKDIR}/${MY_P} -[[ ${PV} == *9999 ]] && S=${S}/master - -pkg_setup() { - enewuser buildbot - - DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added - to support starting buildbot through Gentoo's init system. To use this, - execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. - The scripts can run as a different user if desired." -} - -src_compile() { - distutils-r1_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null - #'man' target is currently broken - emake html - popd > /dev/null - fi -} - -src_install() { - distutils-r1_src_install - - doman docs/buildbot.1 - - if use doc; then - dohtml -r docs/_build/html/ - # TODO: install man pages - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r docker docs/examples - fi - - newconfd "${FILESDIR}/buildmaster.confd" buildmaster - newinitd "${FILESDIR}/buildmaster.initd" buildmaster - systemd_dounit "${FILESDIR}/buildmaster.target" - systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service" - systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service" - - readme.gentoo_create_doc -} - -python_test() { - distutils_install_for_testing - export TEST_HYPER=1 - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" - ewarn " rc-update add buildmaster.myinstance default" - ewarn " /etc/init.d/buildmaster.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildmaster@myinstance.service" - ewarn " systemctl enable buildmaster.target" - ewarn " systemctl start buildmaster.target" - elog - elog "Upstream recommends the following when upgrading:" - elog "Each time you install a new version of Buildbot, you should run the" - elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." - elog "This will add files and fix (or at least detect) incompatibilities between" - elog "your old config and the new code." - fi - elog - elog "In order to create a new instance of buildmaster, execute:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config() { - local buildmaster_path="/var/lib/buildmaster" - einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildmaster_path}/${instance_name}" - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - local buildbot="/usr/bin/buildbot" - if [[ ! -d "${buildmaster_path}" ]]; then - mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" - fi - "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" - chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" - mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ - || die "Unable to create link to init file" - - einfo "Successfully created a buildmaster instance at ${instance_path}." - einfo "To change the default settings edit the master.cfg file in this directory." -} diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index 694b31c8f116..0b08a8046964 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" PYTHON_REQ_USE="sqlite" PYTHON_COMPAT=( python2_7 python3_5 ) @@ -29,7 +29,7 @@ IUSE="crypt doc examples irc test" RDEPEND=" >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}] + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] @@ -40,7 +40,7 @@ RDEPEND=" >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] crypt? ( - >=dev-python/twisted-17.5.0[${PYTHON_USEDEP},crypt] + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] dev-python/idna[${PYTHON_USEDEP}] dev-python/service_identity[${PYTHON_USEDEP}] @@ -112,7 +112,7 @@ src_install() { if use examples; then insinto /usr/share/doc/${PF} - doins -r docker docs/examples + doins -r docs/examples fi newconfd "${FILESDIR}/buildmaster.confd" buildmaster diff --git a/dev-util/buildbot/files/Remove-distro-version-test.patch b/dev-util/buildbot/files/Remove-distro-version-test.patch new file mode 100644 index 000000000000..c489be25c1c3 --- /dev/null +++ b/dev-util/buildbot/files/Remove-distro-version-test.patch @@ -0,0 +1,21 @@ +From b7201f706f9238d642dfe96da89006b437e3760d Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <bdolbec@gaikai.com> +Date: Thu, 26 Oct 2017 12:00:37 -0700 +Subject: [PATCH] Remove distro version test + +--- + buildbot/test/unit/test_buildbot_net_usage_data.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/master/buildbot/test/unit/test_buildbot_net_usage_data.py +index 709c804..7885d1b 100644 +--- a/buildbot/test/unit/test_buildbot_net_usage_data.py ++++ b/buildbot/test/unit/test_buildbot_net_usage_data.py +@@ -153,4 +153,3 @@ class Tests(unittest.TestCase): + distro = linux_distribution() + self.assertEqual(len(distro), 2) + self.assertNotIn("unknown", distro[0]) +- self.assertNotIn("unknown", distro[1]) +-- +libgit2 0.26.0 + |