summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-libs/xosd/ChangeLog8
-rw-r--r--x11-libs/xosd/Manifest4
-rw-r--r--x11-libs/xosd/files/digest-xosd-2.2.5-r11
-rw-r--r--x11-libs/xosd/xosd-2.2.4-r2.ebuild6
-rw-r--r--x11-libs/xosd/xosd-2.2.5-r1.ebuild43
-rw-r--r--x11-libs/xosd/xosd-2.2.5.ebuild8
6 files changed, 62 insertions, 8 deletions
diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index c68d02af9bfe..df7355c28be6 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/xosd
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.24 2003/12/10 18:28:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.25 2004/01/30 06:01:28 raker Exp $
+
+*xosd-2.2.5-r1 (29 Jan 2004)
+
+ 29 Jan 2004; Nick Hadaway <raker@gentoo.org> xosd-2.2.5-r1.ebuild:
+ Added xinerama to IUSE. Properly set configure options for the xmms
+ plugin. Delete the "no" directory if created. See bug #39800.
10 Dec 2003; Heinrich Wendel <lanius@gentoo.org> xosd-2.2.5.ebuild:
stable on x86
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index db6733a75864..75f3d88b9b56 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,9 +1,11 @@
-MD5 aa8a2f9329f86bbeaca847118d7af413 xosd-2.2.5.ebuild 969
+MD5 11e29e0425a6b93500d7d2e57b6e2d39 xosd-2.2.5.ebuild 997
MD5 9c874e0ad2273fca8a92f454297df809 xosd-2.2.4-r2.ebuild 1049
MD5 10bb8562bf1d3efeeb3d07115ebe727c ChangeLog 3339
MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 ccfd2c585fd7b2c7dd59f1e0740fd624 xosd-2.2.5-r1.ebuild 1011
MD5 3c380aec54baadc4ae387d9cbba2d714 files/2.2.4-font-align.patch 640
MD5 99aa8e6851c4a85fcbbcaef42f00ce81 files/xosd-2.2.4-xmms-trackpos.patch 4317
MD5 7012b7e17c6cf060995e65335222ea2b files/2.2.5-xmms-trackpos.patch 4001
MD5 47b823d1241bc14385f5e911dcbf545e files/digest-xosd-2.2.5 62
MD5 3ba5b9b17b7da4ce0b658cd8ba33a4bd files/digest-xosd-2.2.4-r2 67
+MD5 47b823d1241bc14385f5e911dcbf545e files/digest-xosd-2.2.5-r1 62
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.5-r1 b/x11-libs/xosd/files/digest-xosd-2.2.5-r1
new file mode 100644
index 000000000000..60827abb3603
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.5-r1
@@ -0,0 +1 @@
+MD5 96bae6f0800c1710d7d4edb3b37b01e5 xosd-2.2.5.tar.gz 388861
diff --git a/x11-libs/xosd/xosd-2.2.4-r2.ebuild b/x11-libs/xosd/xosd-2.2.4-r2.ebuild
index 105154938bb0..2361deaa29bc 100644
--- a/x11-libs/xosd/xosd-2.2.4-r2.ebuild
+++ b/x11-libs/xosd/xosd-2.2.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.4-r2.ebuild,v 1.2 2003/09/15 19:56:39 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.4-r2.ebuild,v 1.3 2004/01/30 06:01:28 raker Exp $
IUSE="xmms"
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.debian.org/debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa"
DEPEND="virtual/x11
xmms? ( media-sound/xmms
diff --git a/x11-libs/xosd/xosd-2.2.5-r1.ebuild b/x11-libs/xosd/xosd-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..a96c4124caaa
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.5-r1.ebuild,v 1.1 2004/01/30 06:01:28 raker Exp $
+
+IUSE="xinerama xmms"
+
+DESCRIPTION="Library for overlaying text/glyphs in X-Windows X-On-Screen-Display plus binary for sending text from command line"
+HOMEPAGE="http://www.ignavus.net/"
+SRC_URI="http://www.ignavus.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa"
+
+DEPEND="virtual/x11
+ xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${PV}-xmms-trackpos.patch
+}
+
+src_compile() {
+ local myconf=""
+
+ use xinerama || myconf="${myconf} --disable-xinerama"
+
+ use xmms || myconf="${myconf} --disable-new-plugin"
+
+ econf ${myconf} || die
+
+ emake || die
+}
+
+src_install() {
+ make DESTDIR=${D} install || die
+ dodoc AUTHORS ChangeLog NEWS COPYING README
+
+ if [ -d ${D}no ]; then
+ rmdir ${D}no
+ fi
+}
diff --git a/x11-libs/xosd/xosd-2.2.5.ebuild b/x11-libs/xosd/xosd-2.2.5.ebuild
index 4e9f86e5db84..14871d71cf73 100644
--- a/x11-libs/xosd/xosd-2.2.5.ebuild
+++ b/x11-libs/xosd/xosd-2.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.5.ebuild,v 1.3 2003/12/10 18:28:36 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.5.ebuild,v 1.4 2004/01/30 06:01:28 raker Exp $
DESCRIPTION="Library for overlaying text/glyphs in X-Windows X-On-Screen-Display plus binary for sending text from command line"
HOMEPAGE="http://www.ignavus.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.ignavus.net/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa ~mips ~arm"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa"
IUSE="xmms"
DEPEND="virtual/x11
@@ -34,4 +34,6 @@ src_compile() {
src_install() {
make DESTDIR=${D} install || die
dodoc AUTHORS ChangeLog NEWS COPYING README
+
+ #use xmms || rmdir ${D}no
}