Version bump

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 177 insertions, 18 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index ee0e4cbfce71..6cc61fc714fa 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.171 2015/04/08 17:29:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.172 2015/07/07 09:55:50 polynomial-c Exp $
+
+*icewm-1.3.10 (07 Jul 2015)
+
+  07 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> +icewm-1.3.10.ebuild,
+  +files/icewm-1.3.10-menu.patch:
+  Version bump.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> icewm-1.3.8.ebuild,
   icewm-1.3.9.ebuild:
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index cd458251759e..0ced0ada60de 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
 
 AUX IceWM.desktop 185 SHA256 925914dcf680538c11a8d6468d30a21c5eac8408c58d665f914a7f7faf1e835a SHA512 9e44391fa20f02f8aa0495c0d77ec10799e7b7097fff495dbabed457a88c17e00fd53a295b0e0293e8aae275b424928f83cac4e2313afa1cb2b8a1e7ac24c711 WHIRLPOOL 958ae99e9c1b2abaf5f642c6e67bcc86c4d72d06edb88e488eabed73ede6536f8d1adda3e8ff3daf0fe9356d2d7d54e8ab18a933abc5bf9c2c4ca5a38e54d3e4
 AUX icewm 33 SHA256 9c227d5676372166707902073337c0610ea0e1e0bb1c5d8881bd4e3b44919df1 SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 WHIRLPOOL 7248377faae7454d1695d0c094829c47edad23b6bec84197bfeeda6500eb418dc9b627f3d4fe811ebffce2f91c508af66478d7177bfaa0013371f1cc0a4f391b
+AUX icewm-1.3.10-menu.patch 821 SHA256 22ea5c203f75dc41b63cebd026c8964de7d67831a8a958e72a08508231bc65a4 SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e WHIRLPOOL 60b6778b930c2751029d0a62d59cfb1cd4f3ec429c6e29d9fdf976646304845742615d37269475c7198bb7f1a7873ecc902f0950bc47758e3b31f454a1704b46
 AUX icewm-1.3.7-dso.patch 376 SHA256 4c8108800ad05a88011a7e4dbe9ed009a3ff314a434afa0d832ab74785887223 SHA512 e2ca26ef3bf1f1e1ffb452cebdf3cc5cdb8b84c47b5409e68923c0ad6cac8ea399274fd4d0bf71f6a6929445b0f8a1d35edbc2233b90594f05acd6a03e6a8f8a WHIRLPOOL 3eef2a86500b03cba9c08b3159ff21bfe8ffdd6bdfc2747f4a2a2fc62ab0b021a48158ac7f6bf3648d922ab4b9f52f877c3b7894a76cc7c02a213a153c65e9cf
 AUX icewm-1.3.7-gcc44.patch 434 SHA256 60e421ae6de444cacd4e854991b43029422cf1ed1f03a37c17271fb971d0ba76 SHA512 12acc47b5938234bfa76e38f2c6f7ff0e2528aa4feac8bd19eec6743d994f7b5465373ff708232fc3ddcc5fe3cb8c21fda34d1ea6e0e860bb86c58503b2f8d65 WHIRLPOOL 9bd83695f7d13cb8e446a460526f1fff51bc51caef32b56e9fb269259e42de1a5c059785906c4f5bd70617c6ef505aaed2e71af6989e0f7520e33cc1566d72eb
 AUX icewm-1.3.7-menuiconsize.patch 2435 SHA256 ba77282c9b952d0e9f780244edbc708e63bd7bb39e8c583ad3490f025050cebc SHA512 ee56ff65a74d9a4cf4a03bc7e1324c6f0ea180fadc2232ba46a5f467d2b4f6f9e57ca73a658d5f7ed0acce4f399e1c7491ef54a29516da2fef081e7671dd1e3d WHIRLPOOL e3274f791b7081721e77a9cd3207b67b4fd6cb74b741e979ddae7b32c524e4a6c32d1bfa997385ba1faa65bb6001d579a80a4a9a805d9117348a327bb2ebe443
@@ -19,28 +20,28 @@ AUX icewm-keys.patch 1870 SHA256 8e64cf50489fc27b0ddd44faa1e04651981e2d13c8a48bb
 AUX icewm-startup 177 SHA256 2da3eb74acb1ad4fbfdbb7ced872c0ced4248b56d098ef8506ca9aaf625a6145 SHA512 512edf9e94a8bb240e932fa3be7fd4bc78635a0fe0e41ed96de520be188f23d2e03115868f4b3610d190eff50f011531e61ca8eaccbbf194a232e991713580d9 WHIRLPOOL abf6f33d23277b6fa5659a10c539397816817a798f549b50e54e3b5313fb1ad6d7e74fe4503170d7b141d1965b0554409b6b4ef797fb6f85932fcaf58200bf15
 AUX icewm-toolbar.patch 476 SHA256 b855be8a37177cbd4604b92b8f0f55f086c81c6529f7220b3c52d6cd00bce0ad SHA512 66c434c385454e139e495bc9f475f403e0c2f2b241ee2dc4903ab1975198152211b21f836c39338d5a796b2ac8a40f6ce4cb09a6878467bab50177fc105eb9fe WHIRLPOOL 8cf5b8c714ddc96894ec69b4cc274b17b0192a0558416f0aa103ad6a8881a33983af59ef23e406005a988b967bd460622add14249a7b6a359685cc190ce2d406
 AUX icewm-xdg-menu 4380 SHA256 115f081152fe8d376b884402bd8af24f678e68bbf4d6717690678df92eba2c22 SHA512 edbb196bae0c6aff3d5cfa31c50486e0ac9ffc5d287a11221e0a16ab27e176c9c6e724bc00725c5e3eba71df9afa12e5a8132eb0f154c4bc38c3150242f5d9c3 WHIRLPOOL e7380eeab8965d297ef7e16c5deb6d5dccb25e1077197ef0e2c6123d8559e36bd156b9fe2eeef630ff12951c78749ac2051a2d548a69aaf578687ead5db7e213
+DIST icewm-1.3.10.tar.gz 929941 SHA256 dae6aa00c88f700537cc841cbd233ea2905e756f6274f9ebd52020f782502706 SHA512 96834d5ed2d693451ef071d574b4f553431183feefc8c6db97d46666ec086e9ff8d4a1b0c0eaf60cfbb1398be653aad3a47a61b35a5354730c05b1ddfa61bf16 WHIRLPOOL a085604cd70ef0d10ff3a9c9e91b2572f47750e2a5627c1d8feeadd3d9024423b75ffe9339329c59ade855ebd1046d1c18757994ce38aef0fdfca03dcb47e97d
 DIST icewm-1.3.8.tar.gz 905680 SHA256 17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18 SHA512 ce9bf3e736a2f3fad4bbf731647b4e4ad0168cd2c4af66b1c43beef9ceeee39d14909714d2fc73ab13f6c285a74dfe31fffc9677ae8bd2d1077716cd6d6afb72 WHIRLPOOL 5bb0f6fa830ea10978bb8fd31805596c849a370d619626736e1218e844de72e142ed1aaa87b2f2aeb40603fcf2cfaa88ffae242c726ae1151045c6a792d5cf6c
 DIST icewm-1.3.9.tar.gz 890170 SHA256 2d47f8cda48a91ac14fb20890c2df0f304cf8278adf50c3e4070ef68b61a687d SHA512 9c28b004d3a13470e61a3ecbea489d67134b5d1651d84677e8ab0fb732b630d30b7be047553833c818a0ae05841ec808d37d7d50e21e5a562d407cdc74b4943e WHIRLPOOL 8ecba1325da50655524b414280bf4c87f7bcf4c5d0e7edb0df8c6b341680443f961eddf7fd653ac75229aea88100ba8c06b8268196b48f63f6683231f972eb97
+EBUILD icewm-1.3.10.ebuild 3097 SHA256 8a5bb45a130a2327b92d1f215b7151a14c024b5ab44e54e71b0c19dd75936891 SHA512 0b818f2e3f2bd5fc502aa7f10a5f228c2373656d676454831bbce690d7e1d3ab868dec012510488b33baca1c804a63e258c0918b04688da630439e139011fd61 WHIRLPOOL 410fc04888bc3ea17ff587e7b6298902e73badbaea3ccb18f6e77f8ed68da7dc84f78a6a26e46578376de7378d56cb251718ec98d15bf7dc73165818843717db
 EBUILD icewm-1.3.8.ebuild 3427 SHA256 8fa79b067efa07da27a0bec70fed10b21b1b2c08bbfda51a14e005c02bf082e4 SHA512 cc432a096d4e8d36c143b1cd2dd4161a754bfd4c51a35baa668b69e10c4c3d97071981587bc6ae9f399ec3349aa40454f34e8a9ff4a3708f35f4406c887057c4 WHIRLPOOL faf7e66bc5c33c830a0a84c2a1c8136ef097bd9e12e639f441192205aabd713d0d23da33828c791878ef0077a7ed1948e61c22c32b04ef4ef94615b02c3ae62a
 EBUILD icewm-1.3.9.ebuild 3284 SHA256 e49d090ae896eb9309f49381f307e0f49c4fa58ee46523b112ef5760728e79a5 SHA512 88ee0d2b0e86b085db6e2fe234cce3caa808bb0b3ca9fe2339f8366ff1a4550d17e37b20f01fb583505802a71739a2f645bbe1f3df47b8068a6abfb304dad4f3 WHIRLPOOL 6976804ba7d46e8d93368fc5f53d4969ce9632f5d003876f4d9b19ffcb65caf6f6fa1eac2219c3ffd715e8b7ab29c34be97237077e9221ce1057adbc790726d1
-MISC ChangeLog 26854 SHA256 5ce304d65f348c115b77352e303780c9b2a274b8fd491bb1cc4d685a7ae4beae SHA512 c77bf43287108abf34ddd11733b54f50631f3762b6c17ab8da33aada7196162edaabfdc0ea9da936e3b22e6e9ac569b3421b3f19dde9605d7955a2d6382777b8 WHIRLPOOL ad32e84402ef95d7ce2541364ec394d572aecdca3d0a89c49f6d937ad9af369d1f604fb880a42312312ca80e59fce4d8fd3bfeee02c9057dc71182c56c4141f8
+MISC ChangeLog 27016 SHA256 1c4685209241352731db4604d78bf6d029dfb3bef1111b2a4463368b935d9af4 SHA512 b71a0744ef1c70d8a939788e6131515d36ea0be751891f82b34fd8a77b637d7258c17971c025e00c7f4d2b9edb08ac15c01c3dde91d9328211206cd8459bf774 WHIRLPOOL d0c214d4a197e465d7cd47f3866d1f6d96827bf7a50a23856b1137893309facde01c964bc9ea4f7e10b7c8887240f82dd7d66b1c29d26180ec9b26c70f4118c6
 MISC metadata.xml 555 SHA256 63d3fa868a6f6d2323d5c5415c80f86bd2740382fcacb3c6e460f927f5d0f3a6 SHA512 7799aa6a2c87a4c58270df67623a10f3f8b511860d3e18e9fdc6a22dbb94dea352eb95502202ed5fcf1bba9cc35a47fe0e337605f79beab42b172fc094ce8753 WHIRLPOOL d1706c26cf34cc86c54be61045127f27f4511d558e6f73b48f3092d32d077c7c397a917f271d94620822b0ff8a59ef7edce350b0e7faa22f9b19083665ab4fcf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVf8WLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5oAQALBtDIRFlBTkEys8XURgB/KV
-pgPCnuxwNMxK6uGhS+K+CGgVjCWjH4NWO542wlMl8mdkxxRAOVmsdIE+M0ekMWy/
-ieVodksxwxIzrkp++IsufIzGwqfOb++BcUn2AqZCNPKOGsQuVJ3ndRM/Hp4K2mtH
-cb4hJhmnhg53Nb2/Y/A9ebx5E0UBrHaijaq4sWowfrJ9901dwNRHMUBPThD91lm+
-FvGmxp12femww9/k1wjpGm8QNNs4ngofM8ULrzQCgSiHuNf9c38Iy0hqLTchcQlF
-dF4IiZCtpTfCI2Zrh3TtKybkHHNjWqNznhZgAvW+3WnikjgUAfe670snBKS2j9HJ
-oZAmIeBL8o3W56uHUtxozVCAFeKc7NOQhOiGTfdBlyRewTj+IOr6hap37aebpBYo
-GyjnwuFs0u8XsFARHKt6gS1nbxdEBFQniWU3Dcd71pTUhdGOuS/vyoU0P+HqgVg0
-1x3+OoXfBQNuVoz6mlRwz8PgeJlih2VqxLpXsS44GpFB/HLMfjuXQ1LFWxB7XMv7
-yUSiFJ2Uew2Dun9a07bQj6DOTGjZPMFV2OMtG5HV09t6kQfqMLAQoUleTO28EHsf
-oDYvBnc19AgvdR4pKuaU/TOGdG7ZanUvadjWTflCYQDeWybAOv0rma4PD93IoFMq
-/jQPaU+WW8S/mOzwhZpK
-=GL8t
+iQIcBAEBCgAGBQJVm6InAAoJEPiazRVxLXTFqcIP/1T1djOD7QI41Mwp8UPlgJXY
+T/Imv061DvNz/7kqYD36iSdL53jOWyyXRypVRZp4igYo6CqZkGiJLyMFEFu/s6kI
+/3rTLlZzxpkpaYGq6mY68iF51HSNi5rVAJXC7wN7VSBSRsmzzQiYbP3hB6rfkuK2
+Wx3lUhc45Vr3qDJpTId09RX/Ry4/neUYNI6tUc4frDS4HLooDogRNntQl8Ezj0TJ
+gZgdd65j7jYTrl0GoQ2qlZ1BadU4CBHvdPvAF1FQRNg4k+67kujKz3bdL/bQG/kB
+fNk6FA5RStBckfSlJUMTPXjvh5tKDUHPGtwqegtOvLGoVlTwd9wY8WEecxtBFxq6
+vq4eh2g/Lz+//MQbWDGShHwsOGertEddipDQ1ydNuHnHSdhizkkxMmnihNR0jUaX
+UZCB8gSxOjPzhaNtz8h3CzRD4UESey9GbdxOAfJptzQBeJJuWBc7cOMrqsHqRSh7
+g6oWe5kbnksr9K7ERXj0u+HDNj+BgBAl5aL2TF5gNjBfc/21hUU/y9F7F9UResvP
++KxfYNycdiqMt7k8uid0hTtX+sGcom1QoEjnvf2zk1rVTCXiaLkv3/BSe7Q7yyCe
+afMQI0fLJinEmEXtBl5BpvStK46/cEZcww4I0UkHZqgM5e6zw7T85KPNQ3rkaVhp
+O5Z0q7NPreXYTlCL24eR
+=P+p+
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/icewm-1.3.10-menu.patch b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
new file mode 100644
index 000000000000..721a15d25ee3
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.3.10-menu.patch
@@ -0,0 +1,22 @@
+--- icewm-1.3.10/lib/menu.in
++++ icewm-1.3.10/lib/menu.in
+@@ -4,14 +4,9 @@
+ # since modifications to this file will be discarded when you
+ # (re)install icewm.
+ #
+-prog xterm xterm xterm
+-prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
+-prog fte fte fte
+-prog NEdit nedit nedit
+-prog Mozilla mozilla mozilla
+-prog XChat xchat xchat
+-prog Gimp gimp gimp
++prog xterm /usr/share/icons/gnome/16x16/apps/terminal.png xterm
++"Web browser" /usr/share/icons/gnome/16x16/apps/web-browser.png xdg-open about:blank
+ separator
+-menuprog "Desktop Apps" folder icewm-menu-fdo
+-menufile Programs folder programs
+-menufile Tool_bar folder toolbar
++prog "Rebuild program menu" /usr/share/icons/gnome/16x16/actions/edit-find-replace.png /usr/share/icewm/startup
++separator
++menufile Programs folder programs.autogen
diff --git a/x11-wm/icewm/icewm-1.3.10.ebuild b/x11-wm/icewm/icewm-1.3.10.ebuild
new file mode 100644
index 000000000000..21c5fe5c1532
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.3.10.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.10.ebuild,v 1.1 2015/07/07 09:55:50 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Ice Window Manager with Themes"
+HOMEPAGE="http://www.icewm.org/ https://github.com/bbidulock/icewm"
+LICENSE="GPL-2"
+SRC_URI="http://github.com/bbidulock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bidi debug doc gnome minimal nls truetype uclibc xinerama"
+REQUIRED_USE="gnome? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests broken in all versions, patches welcome, bug #323907, #389533
+RESTRICT="test"
+
+#fix for icewm preversion package names
+S=${WORKDIR}/${P/_}
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libSM
+	x11-libs/libICE
+	xinerama? ( x11-libs/libXinerama )
+	bidi? ( dev-libs/fribidi )
+	gnome? (
+		${PYTHON_DEPS}
+		dev-python/pyxdg
+		gnome-base/gnome-desktop:2
+		gnome-base/gnome-menus
+		gnome-base/libgnomeui )
+"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	x11-proto/xproto
+	x11-proto/xextproto
+	doc? ( app-text/linuxdoc-tools )
+	nls? ( >=sys-devel/gettext-0.19.2 )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	if use truetype && use minimal; then
+		ewarn "You have both 'truetype' and 'minimal' use flags enabled."
+		ewarn "If you really want a minimal install, you will have to turn off"
+		ewarn "the truetype flag for this package."
+	fi
+}
+
+PATCHES=(
+	# Fedora patches
+	"${FILESDIR}"/${PN}-1.3.10-menu.patch
+)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+
+	# Fix bug #486710
+	use uclibc && epatch "${FILESDIR}/${PN}-1.3.8-uclibc.patch"
+
+	if ! use doc ; then
+		sed '/^SUBDIRS =/s@ doc@@' -i Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	if use truetype
+	then
+		myconf="${myconf} --enable-gradients --enable-shape --enable-shaped-decorations"
+	else
+		myconf="${myconf} --disable-xfreetype --enable-corefonts
+			$(use_enable minimal lite)"
+	fi
+
+	myconf="${myconf}
+		--with-libdir=/usr/share/icewm
+		--with-cfgdir=/etc/icewm
+		--with-docdir=/usr/share/doc/${PF}/html
+		$(use_enable bidi fribidi)
+		$(use_enable debug)
+		$(use_enable gnome menus-gnome2)
+		$(use_enable nls i18n)
+		$(use_enable nls)
+		$(use_enable xinerama)"
+
+	CXXFLAGS="${CXXFLAGS}" econf ${myconf}
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
+	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+}
+
+src_install(){
+	default
+
+	if use gnome; then
+		dobin "${FILESDIR}"/icewm-xdg-menu
+		exeinto /usr/share/icewm/
+		newexe "${FILESDIR}"/icewm-startup startup
+	fi
+
+	dodoc AUTHORS BUGS CHANGES PLATFORMS README* TODO VERSION
+
+	if ! use doc ; then
+		dohtml -a html,sgml doc/*
+		cp doc/${PN}.man "${T}"/${PN}.1
+		doman "${T}"/${PN}.1
+	fi
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/icewm"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/IceWM.desktop"
+}