added metadata.xml (desktop-misc herd) and updated ebuild with proper einfos and ewarns for #81920

(Portage version: 2.0.51.22-r1)

6 files changed, 66 insertions, 22 deletions

diff --git a/x11-themes/golden-xcursors/ChangeLog b/x11-themes/golden-xcursors/ChangeLog
index 4fe343df6107..ee3d83a4c187 100644
--- a/x11-themes/golden-xcursors/ChangeLog
+++ b/x11-themes/golden-xcursors/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/golden-xcursors
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.14 2005/02/19 19:10:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.15 2005/06/17 03:14:26 smithj Exp $
+
+  17 Jun 2005; Jonathan Smith <smithj@gentoo.org> +metadata.xml,
+  golden-xcursors-0.8.ebuild:
+  added metadata.xml (desktop-misc herd) and updated ebuild with proper einfos
+  and ewarns for #81920
 
   19 Feb 2005; Markus Rothe <corsair@gentoo.org> golden-xcursors-0.8.ebuild:
   Stable on ppc64
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
index 05fbcdd25b65..9e888bb58f2f 100644
--- a/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild,v 1.14 2005/02/19 19:10:13 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild,v 1.15 2005/06/17 03:14:26 smithj Exp $
 
 MY_P="5507-Golden-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -28,23 +28,29 @@ src_install() {
 }
 
 pkg_postinst() {
+	# yes, i know; it is ugly
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+
 	einfo "To use this set of cursors, edit or create the file ~/.Xdefaults"
 	einfo "and add the following line:"
 	einfo "Xcursor.theme: Gold"
 	einfo ""
-	einfo "Also, you can change the size by adding a line like:"
+	einfo "You can change the size by adding a line like:"
 	einfo "Xcursor.size: 48"
 	einfo ""
-	einfo ""
-	einfo "To globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/${X11_IMPLEM}/default/index.theme"
+	einfo "Also, to globally use this set of mouse cursors edit the file:"
+	einfo "   /usr/local/share/cursors/${X11_IMPLEM}/default/index.theme"
 	einfo "and change the line:"
-	einfo "   Inherits=[current setting]"
+	einfo "    Inherits=[current setting]"
 	einfo "to"
-	einfo "   Inherits=Gold"
-	einfo "Note this will be overruled by a user's ~/.Xdefaults file"
+	einfo "    Inherits=Gold"
+	einfo ""
+	einfo "Note this will be overruled by a user's ~/.Xdefaults file."
 	einfo ""
 	ewarn "If you experience flickering, try setting the following line in"
-	ewarn "the Device section of your XF86Config:"
-	ewarn "Option  \"HWCursor\"  \"false\""
+	ewarn ""
+	ewarn "the Device section of your xorg.conf file:"
+	ewarn "    Option  \"HWCursor\"  \"false\""
 }
diff --git a/x11-themes/golden-xcursors/metadata.xml b/x11-themes/golden-xcursors/metadata.xml
new file mode 100644
index 000000000000..31bd1cf869a6
--- /dev/null
+++ b/x11-themes/golden-xcursors/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/x11-themes/silver-xcursors/ChangeLog b/x11-themes/silver-xcursors/ChangeLog
index edacbcaa7846..209b086668bf 100644
--- a/x11-themes/silver-xcursors/ChangeLog
+++ b/x11-themes/silver-xcursors/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/silver-xcursors
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.12 2004/11/24 02:41:37 geoman Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.13 2005/06/17 03:17:15 smithj Exp $
+
+  17 Jun 2005; Jonathan Smith <smithj@gentoo.org> +metadata.xml,
+  silver-xcursors-0.4.ebuild:
+  added metadata.xml (desktop-misc herd) and updated ebuild with proper einfos
+  and ewarns for #81920
 
   23 Nov 2004; Stephen P. Becker <geoman@gentoo.org>
   silver-xcursors-0.4.ebuild:
diff --git a/x11-themes/silver-xcursors/metadata.xml b/x11-themes/silver-xcursors/metadata.xml
new file mode 100644
index 000000000000..31bd1cf869a6
--- /dev/null
+++ b/x11-themes/silver-xcursors/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
index 6647d50be1e2..f5ee48368056 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild,v 1.13 2004/11/24 02:41:37 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild,v 1.14 2005/06/17 03:17:15 smithj Exp $
 
 MY_P="5533-Silver-XCursors-3D-${PV}"
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
@@ -27,22 +27,28 @@ src_install() {
 }
 
 pkg_postinst() {
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+
 	einfo "To use this set of cursors, edit or create the file ~/.Xdefaults"
 	einfo "and add the following line:"
 	einfo "Xcursor.theme: Silver"
 	einfo ""
-	einfo "Also, you can change the size by adding a line like:"
+	einfo "You can change the size by adding a line like:"
 	einfo "Xcursor.size: 48"
 	einfo ""
-	einfo "To globally use this set of mouse cursors edit the file:"
-	einfo "   /usr/share/cursors/${X11_IMPLEM}/default/index.theme"
+	einfo "Also, to globally use this set of mouse cursors edit the file:"
+	einfo "   /usr/local/share/cursors/${X11_IMPLEM}/default/index.theme"
 	einfo "and change the line:"
-	einfo "   Inherits=[current setting]"
+	einfo "    Inherits=[current setting]"
 	einfo "to"
-	einfo "   Inherits=Silver"
+	einfo "    Inherits=Silver"
+	einfo ""
 	einfo "Note this will be overruled by a user's ~/.Xdefaults file."
 	einfo ""
 	ewarn "If you experience flickering, try setting the following line in"
-	ewarn "the Device section of your XF86Config:"
-	ewarn "Option \"HWCursor\" \"false\""
+	ewarn ""
+	ewarn "the Device section of your xorg.conf file:"
+	ewarn "    Option  \"HWCursor\"  \"false\""
 }