diff options
-rw-r--r-- | x11-themes/blueglass-xcursors/ChangeLog | 6 | ||||
-rw-r--r-- | x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild | 23 | ||||
-rw-r--r-- | x11-themes/golden-xcursors/ChangeLog | 6 | ||||
-rw-r--r-- | x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild | 23 | ||||
-rw-r--r-- | x11-themes/silver-xcursors/ChangeLog | 6 | ||||
-rw-r--r-- | x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild | 22 |
6 files changed, 33 insertions, 53 deletions
diff --git a/x11-themes/blueglass-xcursors/ChangeLog b/x11-themes/blueglass-xcursors/ChangeLog index 21c2b23436e6..611c9a58d53a 100644 --- a/x11-themes/blueglass-xcursors/ChangeLog +++ b/x11-themes/blueglass-xcursors/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/blueglass-xcursors # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/ChangeLog,v 1.21 2006/01/03 20:40:17 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/ChangeLog,v 1.22 2006/01/03 21:12:45 nelchael Exp $ + + 03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> + blueglass-xcursors-0.4.ebuild: + Deps for modular X (bug #117643) - removed deps as Donnie suggested. 03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml, blueglass-xcursors-0.4.ebuild: diff --git a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild index ca97518fd22f..bfc3c3410f8a 100644 --- a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild +++ b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild,v 1.20 2006/01/03 20:40:17 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild,v 1.21 2006/01/03 21:12:45 nelchael Exp $ MY_P="5532-BlueGlass-XCursors-3D-${PV}" DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors" @@ -12,29 +12,18 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86" IUSE="" -DEPEND="" -RDEPEND="|| ( x11-base/xorg-server virtual/x11 )" +RDEPEND="" +DEPEND="${RDEPEND}" # Note: although the package name is BlueGlass, the tarball & authors directions # use the directory 'Blue'. src_install() { - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." - - dodir /usr/share/cursors/${X11_IMPLEM}/Blue/cursors/ - cp -R ${WORKDIR}/${MY_P:5}/Blue/cursors ${D}/usr/share/cursors/${X11_IMPLEM}/Blue/ || die + dodir /usr/share/cursors/xorg-x11/Blue/cursors/ + cp -R ${WORKDIR}/${MY_P:5}/Blue/cursors ${D}/usr/share/cursors/xorg-x11/Blue/ || die dodoc ${WORKDIR}/${MY_P:5}/README } pkg_postinst() { - # dirty hacks... - 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: Blue" @@ -43,7 +32,7 @@ pkg_postinst() { einfo "Xcursor.size: 48" einfo "" einfo "To globally use this set of mouse cursors edit the file:" - einfo " /usr/local/share/cursors/${X11_IMPLEM}/default/index.theme" + einfo " /usr/share/cursors/xorg-x11/default/index.theme" einfo "and change the line:" einfo " Inherits=[current setting]" einfo "to" diff --git a/x11-themes/golden-xcursors/ChangeLog b/x11-themes/golden-xcursors/ChangeLog index 8bc111cd97aa..32befdf4f923 100644 --- a/x11-themes/golden-xcursors/ChangeLog +++ b/x11-themes/golden-xcursors/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/golden-xcursors # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.20 2006/01/03 20:42:51 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/ChangeLog,v 1.21 2006/01/03 21:14:28 nelchael Exp $ + + 03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> + golden-xcursors-0.8.ebuild: + Deps for modular X (bug #117643) - removed deps as Donnie suggested. 03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml, golden-xcursors-0.8.ebuild: diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild index a16e9856bce7..75fff73fb7f6 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-2006 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.20 2006/01/03 20:42:51 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/golden-xcursors/golden-xcursors-0.8.ebuild,v 1.21 2006/01/03 21:14:28 nelchael Exp $ MY_P="5507-Golden-XCursors-3D-${PV}" DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors" @@ -12,27 +12,16 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86" IUSE="" -DEPEND="" -RDEPEND="|| ( x11-base/xorg-server virtual/x11 )" +RDEPEND="" +DEPEND="${RDEPEND}" src_install() { - # Set up X11 implementation - X11_IMPLEM_P="$(best_version virtual/x11)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." - - dodir /usr/share/cursors/${X11_IMPLEM}/Gold/cursors/ - cp -R ${WORKDIR}/${MY_P:5}/Gold/cursors ${D}/usr/share/cursors/${X11_IMPLEM}/Gold/ || die + dodir /usr/share/cursors/xorg-x11/Gold/cursors/ + cp -R ${WORKDIR}/${MY_P:5}/Gold/cursors ${D}/usr/share/cursors/xorg-x11/Gold/ || die dodoc ${WORKDIR}/${MY_P:5}/README } 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" @@ -41,7 +30,7 @@ pkg_postinst() { einfo "Xcursor.size: 48" einfo "" einfo "Also, to globally use this set of mouse cursors edit the file:" - einfo " /usr/local/share/cursors/${X11_IMPLEM}/default/index.theme" + einfo " /usr/share/cursors/xorg-x11/default/index.theme" einfo "and change the line:" einfo " Inherits=[current setting]" einfo "to" diff --git a/x11-themes/silver-xcursors/ChangeLog b/x11-themes/silver-xcursors/ChangeLog index dab660aae7f4..2e0da9efde1d 100644 --- a/x11-themes/silver-xcursors/ChangeLog +++ b/x11-themes/silver-xcursors/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/silver-xcursors # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.19 2006/01/03 20:45:35 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/ChangeLog,v 1.20 2006/01/03 21:16:19 nelchael Exp $ + + 03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> + silver-xcursors-0.4.ebuild: + Deps for modular X (bug #117643) - removed deps as Donnie suggested. 03 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml, silver-xcursors-0.4.ebuild: diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild index 9f1658f61d22..dc3d9fdab923 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-2006 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.20 2006/01/03 20:45:35 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild,v 1.21 2006/01/03 21:16:19 nelchael Exp $ MY_P="5533-Silver-XCursors-3D-${PV}" DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors" @@ -12,26 +12,16 @@ SLOT="0" KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86" IUSE="" -DEPEND="" -RDEPEND="|| ( x11-base/xorg-server virtual/x11 )" +RDEPEND="" +DEPEND="${RDEPEND}" src_install() { - #X11_IMPLEM_P="$(best_version virtual/x11)" - #X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - #X11_IMPLEM="${X11_IMPLEM##*\/}" - X11_IMPLEM="xorg-x11" - einfo "X11 implementation is ${X11_IMPLEM}." - - dodir /usr/share/cursors/${X11_IMPLEM}/Silver/cursors/ - cp -R ${WORKDIR}/${MY_P:5}/Silver/cursors ${D}/usr/share/cursors/${X11_IMPLEM}/Silver/ || die + dodir /usr/share/cursors/xorg-x11/Silver/cursors/ + cp -R ${WORKDIR}/${MY_P:5}/Silver/cursors ${D}/usr/share/cursors/xorg-x11/Silver/ || die dodoc ${WORKDIR}/${MY_P:5}/README } 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" @@ -40,7 +30,7 @@ pkg_postinst() { einfo "Xcursor.size: 48" einfo "" einfo "Also, to globally use this set of mouse cursors edit the file:" - einfo " /usr/local/share/cursors/${X11_IMPLEM}/default/index.theme" + einfo " /usr/share/cursors/xorg-x11/default/index.theme" einfo "and change the line:" einfo " Inherits=[current setting]" einfo "to" |