gentoo resync : 29.10.2017

6 files changed, 115 insertions, 2 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 7add4b196255..f806a4f749ac 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -3,7 +3,7 @@ AUX 1.3.0-OS-detect.patch 408 SHA256 e34b9270ac8fb6ed27fcf75b9450fafd7720a540903
 DIST lumina-1.2.0_p1.tar.gz 56032695 SHA256 f8366212fe3f29039c5febef5b4de97a92eb72483e2d97f5c086edf8fc65bd49 SHA512 8490e2b0f2fa08b2d63ec688f9993771ea935129a2947ef7bfa1874424cbede6d8877083ce90658c283858e67397383b5bab536388e9222b440015ebdf8b2919 WHIRLPOOL 6a7fc95022c4f9cc372c4fafc87cbda70a5f3ebcb52dc1f96516460df928e6e2f02ea380104bd7df9f7df33b1d098b24d8e73ec7ffe77e82a633c920634f9c70
 DIST lumina-1.3.0_p1.tar.gz 86451718 SHA256 76f2b6d45d37d154426cb100d46e3ca4e5e7eca51a7f9f9e442261bfe61b1c31 SHA512 93fb195f26984a2ba6e62dbe1ea619e4ab8e936d1cf1d335db8a7e51058c9be8d3e389146259f8229fb5dc6477610dcc2e1278c4e2a348f27904a318ba095707 WHIRLPOOL 6f3af86b66adc66a1b76732e23189946ad35e4897e4bd00912742e3d972bcf0d816b60055098c8ac1104e7e20ce938e7e4727c7501b5e7c92dcb49794c1bb38e
 EBUILD lumina-1.2.0_p1.ebuild 1597 SHA256 e585aa7a6baac5442e94023d135bec5f78eff6e9ea14c3d91e7dd6fd3b5b5bb6 SHA512 80e936102bcb783232e323b15051f17fc487f56bce3f91c5a5e7c21f4c559f5bcee02b80031d981377897d58213bfb4b576812627e7242c3e64c1407b2f6a549 WHIRLPOOL a446b51f5a11005fc4e8a5462a2c09949df4150f7a4b7ca4406fd977cc5e82edce621b50fc0d094168e48b2390592b4ca8b9bc0d80d20d0d7f9a82da6ac2197d
-EBUILD lumina-1.3.0_p1.ebuild 1464 SHA256 6e711c284a13f5c7b9599e1a2ec03a0ed60116f5cd8e9f9e9131832f91cd5274 SHA512 41eab50e8dfcb3d0fe9b8a599f4ff108f572ea93c06e2aa92fa80bfc38e1551f3d519467fb58bcdfd4eb7d8aa7318cca72d7a39140d9f4ee86eb6007200c03c8 WHIRLPOOL 252efa9cd9140240370dd0fa2322246fab1ced0f00e1880511cc46345353e7554c6d86375cf09ae0b0af923b8f7f463e0c9a51f59fe99dda9e70c55c71c4c47a
+EBUILD lumina-1.3.0_p1.ebuild 1463 SHA256 7819577030111d7d83b0bd456c497bcaf35d05184bf3dc47dd0ff4bfa36b2184 SHA512 a443eee52b91b9db89a881f9c6d3014ec389246dcaf6c5ff8e72c21ed62e854703e6a9623ceba703aa67c35280d33415f9cbb89704b417664903c53adc66691d WHIRLPOOL ab98b2f746f4759f3fb7f11869ae256c7cd482b487bf2394215e5aca31308940679b111a89eb5ce43264d67a44479e1a7d00cf74a5a6292f4ca6c41cb3222eac
 EBUILD lumina-9999.ebuild 1388 SHA256 27fef91f532f765d9093b4f6d9058403b753f8c175897e7f0c2a198b632629b7 SHA512 3676f6aa70c001e6a9e04f44261dd669a5b5eb5bf2c8fd8625a1226804079339ecbf75d66ed61f0315fbf3951df39d036c76556c2221994653408dcbb2f369c3 WHIRLPOOL 34a651e9bf71cbb46aecdcd871dbf7891d88ebea31495b51485530f07445d266cc5a63f4f78fd5c9e4e46457c1aa18f6ba64dbcb28f09e354cabf1d6266a9847
 MISC ChangeLog 903 SHA256 b1b26b42764af12c8710a72f38f65da5021ad128b1127b34a5201198ec0d6dcb SHA512 f9ebd062b553ae8c644b723b05ff8db8936d8cf936ccd481954729f1a49c2cf45fc2742742f9091c15b553194e851b6a6b20be3b8867bf0c2c6be6f31420b253 WHIRLPOOL 3038057f792b98aeff7664198928e9ed3126feb82fd566c3e672abbef5a41557bd9ff5b28909b034db1befc6852f40cd21d569e2ce8305ff11526e2a4df5b2cb
 MISC metadata.xml 1959 SHA256 45fa6bb4b8c32add820b31c87d3e72dba94a3978c94bd819ab4bd93fddaec94c SHA512 05b50342a8ccfb076cdfd9f761162853d17d444323d364613b6bbfc7b0309d3afb0e7dfd33a5350babe6526c866596e5677bda54d219e3bcf57c96736bf83093 WHIRLPOOL 17515e587293bcec4564547f4ccad33b0c22c60d4130259e9148de062e0ef2e7d0495d98661d90eeafdadc31c3d8336e4c1289d5661a6be65421d5fe12f88b1c
diff --git a/x11-wm/lumina/lumina-1.3.0_p1.ebuild b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
index 794daf6eea80..3c364500c827 100644
--- a/x11-wm/lumina/lumina-1.3.0_p1.ebuild
+++ b/x11-wm/lumina/lumina-1.3.0_p1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="desktop-utils"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/x11-wm/stumpwm-contrib/Manifest b/x11-wm/stumpwm-contrib/Manifest
index 6c9371ed49a0..b42650f3f997 100644
--- a/x11-wm/stumpwm-contrib/Manifest
+++ b/x11-wm/stumpwm-contrib/Manifest
@@ -1,4 +1,6 @@
 DIST stumpwm-contrib-20170921.tar.bz2 573525 SHA256 57973985fbe7e441ec73c65c333b61db70445874745b4d3499a746300407f673 SHA512 ab5a9b93e85d36ac35ff6b2aa8c77e3084b34a25d4f665edac296dfa24ac35aff6578e0cdf9556ebe6f57755be5d0c9c476bfbbdd2bfcc1e39c57881c57bea33 WHIRLPOOL f6e276fecee3230078e702c6388f9f54434e1f860fe5aa0e382ae2ab131ca27b96af477e66a4b8e34dd5e676cbfaa3e2d31b234dbb4eb7eb5c54aab0ee4ea6e6
+DIST stumpwm-contrib-20171028.tar.bz2 573283 SHA256 7845adea306415147dac40357c9d46fd19a00f14a6b318a8132db1de2a3d3633 SHA512 1b4bc04e1c7c4946ac7c1cf2e4e661fc4543cfc150e97184846f8ecd3a8155d0b183b3ed74b252a1a83622354a61ac1021da00e6b6913a817a606d165829ba02 WHIRLPOOL da838686ea3ec7f9638282558ede4c0aa20c268605d12cc3450d3fc5aca31911750b4024ef3e85d588bd30e9296af1c35ef2b02f89bb0e1ada08f50ead02fc4b
 EBUILD stumpwm-contrib-20170921.ebuild 735 SHA256 30cf25b8648fb13a36ec24c9bc1092b4f5858dd276f758a953d2a10bf7b6eca8 SHA512 6e973929e9918b7b050ac3fa72e2fa21579978ee76912ee36d1d91914b5fcd9f04ac267abdd99ef17231ec1eccccd20d5f909fa0562b67fed24d1435604b58a0 WHIRLPOOL e763521ff63683bd871a7c4787aa811c9e3460d5d39d3fd379817c8b18f359429a14665ca88d36d1cf0bb572d418dc3f06056be58a17921937f05223180ceb14
+EBUILD stumpwm-contrib-20171028.ebuild 681 SHA256 08b17297a0ce153dbe76a99cbabb00a9d3cf541cd4c108e8a378f44281f43d9d SHA512 19486f03d44f5ae244b660a465b309a8b39d6ae8ee86945e46db7a8e4760656ea41857f7278c3bcfa6969b50b5ea159a4c131b450a489d1dd9e045abc0b9440b WHIRLPOOL f24b9de91a05f74dc2c685996b74d2a3c2a5f02c374b5972a213cc2a3d3b08b6455abf6ef38109b1c88cb60f50626a862e863008de2e61458a268c344e40318f
 EBUILD stumpwm-contrib-99999999.ebuild 735 SHA256 30cf25b8648fb13a36ec24c9bc1092b4f5858dd276f758a953d2a10bf7b6eca8 SHA512 6e973929e9918b7b050ac3fa72e2fa21579978ee76912ee36d1d91914b5fcd9f04ac267abdd99ef17231ec1eccccd20d5f909fa0562b67fed24d1435604b58a0 WHIRLPOOL e763521ff63683bd871a7c4787aa811c9e3460d5d39d3fd379817c8b18f359429a14665ca88d36d1cf0bb572d418dc3f06056be58a17921937f05223180ceb14
 MISC metadata.xml 338 SHA256 42f922c2c80b9c16bded32f0805e443b2d252fb5cfa19863ce9fe578930937db SHA512 d662b61f41f064ce5fb100324aec996c0956736c9a56f797a2522bb5a1ac7731eec1792d72aa11e85bdb162d7f3b345f8d06540c7452b34bf3064febc1136f64 WHIRLPOOL cb40783e6d7bc211d20553ada44dd82ca4c743c1194bea22246eaa187b11adc29dde1c94cc49f2dd30f1bb7e5e6d958a78ef0294fd2467d8adcdba16a3e970f1
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-20171028.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-20171028.ebuild
new file mode 100644
index 000000000000..06ec6f840939
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-20171028.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3
+
+DESCRIPTION="Extension Modules for StumpWM"
+HOMEPAGE="https://github.com/stumpwm/stumpwm-contrib/"
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-3 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=x11-wm/stumpwm-1.0.0"
+
+CONTRIBCATEGORIES="media modeline minor-mode util"
+
+src_install() {
+	common-lisp-install-sources -t all ${CONTRIBCATEGORIES}
+	dobin util/stumpish/stumpish
+	dobin util/pinentry/stumpwm-pinentry
+	dodoc README.org
+}
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index f076be13c83e..1600b60656a1 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,7 +1,9 @@
 AUX 70stumpwm-gentoo.el 84 SHA256 45683a3c00460e54243ac2489cc78ff394f2d5818ec7b2fe72ca5ffc33b2e1a2 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1 WHIRLPOOL 8b494c5df00f07f753580bbcb009920de4eabb7d561719b8b3fd4c9cf2d41f9e31c863a241113b361c24e332fe774c38c3bdb65d0d0b8b6f25bd9fe7046e2698
 AUX README.Gentoo 1894 SHA256 a708ee3f7fba6862ae2685daa4707c5a58f500c07862da0dafb92c17bf78b82c SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09 WHIRLPOOL a4adb14ed13157619a1efcd7a2974c19dac6270f373994311eba2bf2e5b83f38ede7dafa9289d09b2953948670687cdfdd97a7fbd25be67ee88edff14301b49d
 DIST stumpwm-1.0.0.tar.gz 200794 SHA256 31fcb6fb34af20bf4857bb4621ab4b2c9bd6bec92bfd9ddaf88a18f850ba5dd5 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac WHIRLPOOL 7049299b1c5db42f7379f3f741de8d87e3322deac6787494fb09c553130e0c2c79de93fdcb33beabb80f44f5b29a03f25bc61bfdcb3755043b4937627a3658fc
+DIST stumpwm-1.0.1_rc.tar.gz 197530 SHA256 6233133b0e0d8cc54f44abc5ab43ef55380d3c2f24bf53e837aab5875c71be1a SHA512 3ba68987e61bdb46fde9c6bbed82b630be1db3272bdfb844a9d7abf3f810e94e560a28d4951308cab5af1f93b35710b10bb1a1a35450a8445a1b959888266df2 WHIRLPOOL e3d7d82827028f4a61bc5aa0975d3212e0785cadc4effb95bfaa5828a57777845c47f3beb265cc88c0fe2448d8756969e7d69c76a134565b7a0b181ff281259e
 EBUILD stumpwm-1.0.0.ebuild 2000 SHA256 5744f862070f0d77be62b94af5c0fe524b65a06790545827e2934d96892a6548 SHA512 5ef81d50b544bb0df49e14dec44d3b88573b8938efddb870d8522329e2929a1d766453d8e0d537fae17b42ee430295afe106672982a44226d90b6ef8d2986f89 WHIRLPOOL b423c9b66bac2cebbf295db279b573217fa2c74f5debca5352ca6168a0614cdd04f1b63f9d86b752d34255904562097ba33e57a231736d345a3ca6a0e64c2267
+EBUILD stumpwm-1.0.1_rc.ebuild 1683 SHA256 ac48c61960d9248e9a0e950f9fcc7c1ba698b3549c80a60840b20b80b0c235ae SHA512 535e6dd5d066a8468822252f3cc899c61f260ca9d8bb8f7b7348a5689b828599609cedb3017aa02df0c09ce087d182161c2c7e731f559273d354957786d296d9 WHIRLPOOL 3d53166cd9f0a98b25a45ba405bcd880e1c5f8c306e444f99220f93c2aca6880ae02a5ca797bab9d5dada28c26c42958936e2d7476a5c7d1fba684de1c3a869a
 MISC ChangeLog 4202 SHA256 4cb6f95ee88f1a3f9a972f4eec281e05dd7e2aa0ad124bebf36f370ca34bc38b SHA512 f9371fd5906d25ae8d036831248d3db72c56b157fb6b54727ec28bd37a2964a45f87734aab1cd38f91fe72620206b1bba38535c7cad7b005d8e4980c296eb9a0 WHIRLPOOL 10c6ab0711f3d6e51839c3061a45da1ade001545b76996da6f5dcee162f108ed53ad57355e7efae233089db777f826a532e830545fd08c308be1a55fbe1a7f7d
 MISC ChangeLog-2015 1987 SHA256 f5eae5e51be2f68ac25698c140f367ef9975023120cca8e7c2a3b003ebf77d1b SHA512 4b1a93c67e72eeabb75a459eec64758e1326a7a2b0f1d3ce124536e11d91f624dbc23bfa0b4cea56e32f15c01d540da6822a76134dce3fbdf8fad32d394de0eb WHIRLPOOL fb5cd0394ae822d7117a1d95a4c37ebb0b50a1895a910399771edac8886f56d94c6550c34ead08ddc4e3cf4263e2ca80bb8bd06896e92b6bdced8ca62918a167
 MISC metadata.xml 2521 SHA256 afe4d1bbea8fa28f84e35c3c1a43d4c8871b1bc5218e86fb3a6e720d4c44aa2a SHA512 98a39ff560bb2317766cdd3b3360a55542c9d1ca4c7f8d814863f133744636c300cea4622886dd8318390d17b75ba2a42151ad5e9273bfb7054e4581f9d33e89 WHIRLPOOL 28f5106b8bf8a44130ce843cc13fda5b998fe0254b35b6547475304eb70f76b0e465b2caa3192e46c86a52746ececdbf6c9cc605c15106ed845d867f9f86657e
diff --git a/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild b/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
new file mode 100644
index 000000000000..13ae3486751d
--- /dev/null
+++ b/x11-wm/stumpwm/stumpwm-1.0.1_rc.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit common-lisp-3 autotools elisp-common xdg-utils versionator
+
+MY_PV="$(replace_version_separator '_' '-')"
+
+DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
+HOMEPAGE="https://stumpwm.github.io/"
+SRC_URI="https://github.com/stumpwm/stumpwm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib doc emacs"
+
+RESTRICT="strip mirror"
+
+RDEPEND="dev-lisp/cl-ppcre
+		>=dev-lisp/sbcl-1.3.0
+		emacs? ( virtual/emacs app-emacs/slime )"
+DEPEND="${RDEPEND}
+		sys-apps/texinfo
+		doc? ( virtual/texi2dvi )"
+
+PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+SITEFILE=70${PN}-gentoo.el
+CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
+
+install_docs() {
+	local pdffile="${PN}.pdf"
+
+	texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
+	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
+	dodoc AUTHORS NEWS README.md README.Gentoo
+	doinfo "${PN}.info"
+	docinto examples
+	dodoc sample-stumpwmrc.lisp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf --with-lisp=sbcl
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	dobin stumpwm
+	make_session_desktop StumpWM /usr/bin/stumpwm
+
+	common-lisp-install-sources *.lisp
+	common-lisp-install-asdf
+	# Fix ASDF dir
+	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
+		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
+	use doc && install_docs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}