Version bump

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 159 insertions, 1 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/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"
+}