revbump + modular X fixes

(Portage version: 2.1)

5 files changed, 134 insertions, 1 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index b92b14a32969..adba8e40ddda 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.52 2006/06/11 19:59:52 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.53 2006/06/11 20:04:36 antarus Exp $
+
+*xosd-2.2.14-r1 (11 Jun 2006)
+*xosd-2.2.10-r1 (11 Jun 2006)
+
+  11 Jun 2006; Alec Warner <antarus@gentoo.org>
+  -files/xosd-2.2.14-bmp-fixes.patch, -xosd-2.2.10.ebuild,
+  +xosd-2.2.10-r1.ebuild, -xosd-2.2.14.ebuild, +xosd-2.2.14-r1.ebuild:
+  forgot to devbump :/
 
   11 Jun 2006; Alec Warner <antarus@gentoo.org> xosd-2.2.10.ebuild,
   xosd-2.2.14.ebuild:
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.10-r1 b/x11-libs/xosd/files/digest-xosd-2.2.10-r1
new file mode 100644
index 000000000000..191a4afd6c30
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.10-r1
@@ -0,0 +1,3 @@
+MD5 2a598c1e9f940830d04167c48845758c xosd-2.2.10.tar.bz2 285927
+RMD160 78c92a47f1b56e69a6e36771e5d68e38b9f47954 xosd-2.2.10.tar.bz2 285927
+SHA256 117c6f0f9a0b09802700ec2fee09a088cf09d3e63fe11f998f8aaed53f3e3d21 xosd-2.2.10.tar.bz2 285927
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.14-r1 b/x11-libs/xosd/files/digest-xosd-2.2.14-r1
new file mode 100644
index 000000000000..9dfda72e3eaf
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.14-r1
@@ -0,0 +1,9 @@
+MD5 e423c9ea07db0c979ed47222d675482f xosd-gentoo-m4-1.tar.bz2 5043
+RMD160 6b464fe90adcee353064db37634bde7255dd0426 xosd-gentoo-m4-1.tar.bz2 5043
+SHA256 6cd8c8e8bef4576e332e9f855e5ae7071b4da5e7ce0e96906531784aec2c061f xosd-gentoo-m4-1.tar.bz2 5043
+MD5 6b29383308eba681b842d3419d72b220 xosd_2.2.14-1.diff.gz 8616
+RMD160 a79a47aa50f41c9cfd531c7580b4f175f7b4c068 xosd_2.2.14-1.diff.gz 8616
+SHA256 1b74a379030a2a8a1c36b6589023445bc1f620dbfa12ef799590568505f390b2 xosd_2.2.14-1.diff.gz 8616
+MD5 4b349fe930e4eee2f504d6c02673e24d xosd_2.2.14.orig.tar.gz 418331
+RMD160 8a39756c5a46f2897be9bbd47dd86770f42ed648 xosd_2.2.14.orig.tar.gz 418331
+SHA256 4f1fa96f4895baee6a3cba40f188a0da23bbac9d68e8c326d749e084143cb508 xosd_2.2.14.orig.tar.gz 418331
diff --git a/x11-libs/xosd/xosd-2.2.10-r1.ebuild b/x11-libs/xosd/xosd-2.2.10-r1.ebuild
new file mode 100644
index 000000000000..4187a41d964c
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.10-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.10-r1.ebuild,v 1.1 2006/06/11 20:04:36 antarus Exp $
+
+inherit eutils
+
+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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ~sparc ~x86"
+
+DEPEND="|| ( (
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto )
+	virtual/x11 )
+	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/2.2.8-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.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
new file mode 100644
index 000000000000..fe2b233f6656
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.1 2006/06/11 20:04:36 antarus Exp $
+
+inherit eutils
+
+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="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/x/xosd/${PN}_${PV}-1.diff.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xinerama xmms"
+
+RDEPEND="|| ( ( x11-libs/libX11
+	x11-libs/libXext )
+	virtual/x11 )
+	xmms? (
+		media-sound/xmms
+		>=media-libs/gdk-pixbuf-0.22.0
+	)"
+
+DEPEND="|| ( (
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xproto )
+	virtual/x11 )
+	${RDEPEND}
+	>=sys-devel/autoconf-2.57
+	>=sys-devel/automake-1.8"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/2.2.8-xmms-trackpos.patch
+	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
+
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
+	libtoolize --force --copy || die
+	aclocal -I ${WORKDIR}/m4 || die
+	automake -a -f -c || die
+	autoconf || die
+}
+
+src_compile() {
+	econf \
+		`use_enable xinerama` \
+		`use_enable xmms new-xmms` \
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS COPYING README TODO
+}