Make cursors install to the same directory as they did in monolith. Patch from Christophe Saout <christophe@saout.de>.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 48 insertions, 2 deletions

diff --git a/x11-themes/xcursor-themes/ChangeLog b/x11-themes/xcursor-themes/ChangeLog
index 285c926d2a98..747a35e0820b 100644
--- a/x11-themes/xcursor-themes/ChangeLog
+++ b/x11-themes/xcursor-themes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xcursor-themes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/xcursor-themes/ChangeLog,v 1.1 2005/08/16 02:21:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/xcursor-themes/ChangeLog,v 1.2 2005/08/16 02:25:54 spyderous Exp $
+
+*xcursor-themes-0.99.0-r1 (16 Aug 2005)
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/make-cursordir-configurable.patch,
+  +xcursor-themes-0.99.0-r1.ebuild:
+  Make cursors install to the same directory as they did in monolith. Patch
+  from Christophe Saout <christophe@saout.de>.
 
   16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   +xcursor-themes-0.99.0.ebuild:
diff --git a/x11-themes/xcursor-themes/Manifest b/x11-themes/xcursor-themes/Manifest
index c6a99331ec11..ed79f4e7b375 100644
--- a/x11-themes/xcursor-themes/Manifest
+++ b/x11-themes/xcursor-themes/Manifest
@@ -1,3 +1,6 @@
 MD5 66ba30fc90e027a897a05f236b9bdb1b xcursor-themes-0.99.0.ebuild 499
-MD5 d428508bbb53b0d9ee7ddeabd2293390 ChangeLog 734
+MD5 58497b7586bffadc279eee64e78c831a ChangeLog 1034
+MD5 c249ed4249589c47877fc07d0cb94554 xcursor-themes-0.99.0-r1.ebuild 624
 MD5 bb3e47d1a01ff8ae9c2220c341563417 files/digest-xcursor-themes-0.99.0 74
+MD5 c6018649c97cb078e02a77ca12345864 files/make-cursordir-configurable.patch 496
+MD5 bb3e47d1a01ff8ae9c2220c341563417 files/digest-xcursor-themes-0.99.0-r1 74
diff --git a/x11-themes/xcursor-themes/files/digest-xcursor-themes-0.99.0-r1 b/x11-themes/xcursor-themes/files/digest-xcursor-themes-0.99.0-r1
new file mode 100644
index 000000000000..19c95516f853
--- /dev/null
+++ b/x11-themes/xcursor-themes/files/digest-xcursor-themes-0.99.0-r1
@@ -0,0 +1 @@
+MD5 70895b66058b37f9c90c9a0f5b26d22c xcursor-themes-0.99.0.tar.bz2 616784
diff --git a/x11-themes/xcursor-themes/files/make-cursordir-configurable.patch b/x11-themes/xcursor-themes/files/make-cursordir-configurable.patch
new file mode 100644
index 000000000000..b42528587cdd
--- /dev/null
+++ b/x11-themes/xcursor-themes/files/make-cursordir-configurable.patch
@@ -0,0 +1,14 @@
+diff -Nur xcursor-themes-0.99.0.orig/configure.ac xcursor-themes-0.99.0/configure.ac
+--- xcursor-themes-0.99.0.orig/configure.ac	2005-08-01 22:15:19.000000000 +0200
++++ xcursor-themes-0.99.0/configure.ac	2005-08-16 01:33:01.000000000 +0200
+@@ -18,7 +18,9 @@
+ fi
+ AC_SUBST([XCURSORGEN])
+ 
+-cursordir="${datadir}/icons"
++AC_ARG_WITH(cursordir,	[  --with-cursordir=DIR ],
++			[ cursordir="$withval" ],
++			[ cursordir="${datadir}/icons" ])
+ AC_SUBST([cursordir])
+ 
+ AM_CONDITIONAL(WHITEGLASS, true)
diff --git a/x11-themes/xcursor-themes/xcursor-themes-0.99.0-r1.ebuild b/x11-themes/xcursor-themes/xcursor-themes-0.99.0-r1.ebuild
new file mode 100644
index 000000000000..b36b632be486
--- /dev/null
+++ b/x11-themes/xcursor-themes/xcursor-themes-0.99.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/xcursor-themes/xcursor-themes-0.99.0-r1.ebuild,v 1.1 2005/08/16 02:25:54 spyderous Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org cursors data"
+KEYWORDS="~amd64 ~sparc ~x86"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXcursor
+	=media-libs/libpng-1.2*"
+DEPEND="${RDEPEND}
+	x11-apps/xcursorgen"
+
+PATCHES="${FILESDIR}/make-cursordir-configurable.patch"
+
+CONFIGURE_OPTIONS="--with-cursordir=/usr/share/cursors/xorg-x11"