Bump to 0.8.5 and added minimal and xpm flags. bug #192257 Thanks to MATSUU Takuto <matsuu@gentoo.org>

(Portage version: 2.1.2.12)

5 files changed, 77 insertions, 47 deletions

diff --git a/x11-misc/dzen/ChangeLog b/x11-misc/dzen/ChangeLog
index d7ecde738344..9866604b9f4c 100644
--- a/x11-misc/dzen/ChangeLog
+++ b/x11-misc/dzen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/dzen
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.2 2007/08/13 15:46:13 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.3 2007/09/16 21:56:18 coldwind Exp $
+
+*dzen-0.8.5 (16 Sep 2007)
+
+  16 Sep 2007; Santiago M. Mola <coldwind@gentoo.org> -dzen-0.5.0.ebuild,
+  +dzen-0.8.5.ebuild:
+  Bump to 0.8.5 and added minimal and xpm flags. bug #192257 Thanks to MATSUU
+  Takuto <matsuu@gentoo.org>
 
 *dzen-0.8.0 (13 Aug 2007)
 
diff --git a/x11-misc/dzen/dzen-0.5.0.ebuild b/x11-misc/dzen/dzen-0.5.0.ebuild
deleted file mode 100644
index c9aba6a6812b..000000000000
--- a/x11-misc/dzen/dzen-0.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.5.0.ebuild,v 1.1 2007/06/30 18:27:38 coldwind Exp $
-
-inherit toolchain-funcs
-
-SLOT="2"
-MY_P="${PN}${SLOT}-${PV}"
-
-DESCRIPTION="a general purpose messaging, notification and menuing program for
-X11."
-HOMEPAGE="http://gotmor.googlepages.com/dzen"
-SRC_URI="http://gotmor.googlepages.com/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~x86"
-IUSE="xinerama"
-
-RDEPEND="x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "s:/usr/local:/usr:g" \
-		-e "s/-Os/${CFLAGS}/g" \
-		-e "/CC/s:cc:$(tc-getCC):" \
-		-i config.mk || die "sed failed"
-	if use xinerama ; then
-		sed -e "/^LIBS/s/$/\ -lXinerama/" \
-			-e "/^CFLAGS/s/$/\ -DDZEN_XINERAMA/" \
-			-i config.mk || die "sed failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README || die
-}
diff --git a/x11-misc/dzen/dzen-0.8.5.ebuild b/x11-misc/dzen/dzen-0.8.5.ebuild
new file mode 100644
index 000000000000..59fe8a8a5f8d
--- /dev/null
+++ b/x11-misc/dzen/dzen-0.8.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.8.5.ebuild,v 1.1 2007/09/16 21:56:18 coldwind Exp $
+
+inherit toolchain-funcs multilib
+
+SLOT="2"
+MY_P="${PN}${SLOT}-${PV}"
+
+DESCRIPTION="a general purpose messaging, notification and menuing program for
+X11."
+HOMEPAGE="http://gotmor.googlepages.com/dzen"
+SRC_URI="http://gotmor.googlepages.com/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~x86"
+IUSE="minimal xinerama xpm"
+
+RDEPEND="x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e "s:/usr/local:/usr:g" \
+		-e "s:-Os:${CFLAGS}:g" \
+		-e "/CC/s:gcc:$(tc-getCC):" \
+		-e "s:/usr/lib :/usr/$(get_libdir):" \
+		-i config.mk gadgets/config.mk || die "sed failed"
+	sed -i -e "/strip/d" Makefile gadgets/Makefile || die "sed failed"
+	if use xinerama ; then
+		sed -e "/^LIBS/s/$/\ -lXinerama/" \
+			-e "/^CFLAGS/s/$/\ -DDZEN_XINERAMA/" \
+			-i config.mk || die "sed failed"
+	fi
+	if use xpm ; then
+		sed -e "/^LIBS/s/$/\ -lXpm/" \
+			-e "/^CFLAGS/s/$/\ -DDZEN_XPM/" \
+			-i config.mk || die "sed failed"
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if ! use minimal ; then
+		cd "${S}"/gadgets
+		emake || die "emake gadgets failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README || die
+
+	if ! use minimal ; then
+		cd "${S}"/gadgets
+		emake DESTDIR="${D}" install || die "emake gadgets install failed"
+		dodoc README* || die
+	fi
+}
diff --git a/x11-misc/dzen/files/digest-dzen-0.5.0 b/x11-misc/dzen/files/digest-dzen-0.5.0
deleted file mode 100644
index bae2a13edec4..000000000000
--- a/x11-misc/dzen/files/digest-dzen-0.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 662f1cead29bbd60223a2cb64685aca8 dzen2-0.5.0.tar.gz 15734
-RMD160 18901f12b5fed56c5e6d385cb412832179756f77 dzen2-0.5.0.tar.gz 15734
-SHA256 cb879ffdc31eb9d6e2fb8c879e84624d2cc6259b6824ca2ea577644d831de130 dzen2-0.5.0.tar.gz 15734
diff --git a/x11-misc/dzen/files/digest-dzen-0.8.5 b/x11-misc/dzen/files/digest-dzen-0.8.5
new file mode 100644
index 000000000000..74ea15c7dd99
--- /dev/null
+++ b/x11-misc/dzen/files/digest-dzen-0.8.5
@@ -0,0 +1,3 @@
+MD5 5978620c2124c8a8ad52d7f17ce94fd7 dzen2-0.8.5.tar.gz 33274
+RMD160 bbefbff779cd8eb3ea06eda0666f5b0fe99b7b90 dzen2-0.8.5.tar.gz 33274
+SHA256 5e4ce96e8ed22a4a0ad6cfafacdde0532d13d049d77744214b196c4b2bcddff9 dzen2-0.8.5.tar.gz 33274