diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 22 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.4-r2.ebuild | 40 |
3 files changed, 36 insertions, 32 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 5ead2384eb53..080d5a06c54a 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.281 2007/10/01 10:31:56 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.282 2007/10/01 10:33:27 dberkholz Exp $ + + 01 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; + xorg-server-1.4-r2.ebuild: + Fix variable quoting caught by my repoman patch. *xorg-server-1.4-r2 (01 Oct 2007) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index b7c4d97e06e3..3f3ae4be789a 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -118,14 +118,14 @@ EBUILD xorg-server-1.4-r1.ebuild 17744 RMD160 2949e3b6788a90930417d5992e07f19527 MD5 b20fa97c5dceb441daf94054d58c7634 xorg-server-1.4-r1.ebuild 17744 RMD160 2949e3b6788a90930417d5992e07f19527925433 xorg-server-1.4-r1.ebuild 17744 SHA256 859933442e285bc243ea34b809ba3c184a7efe4b733e30bb0bfc11aa233ca326 xorg-server-1.4-r1.ebuild 17744 -EBUILD xorg-server-1.4-r2.ebuild 17809 RMD160 b0cc1f1eb923daf0078d6379dd0916f3e463b628 SHA1 ab87dc5cbc8fb7bf2f299aa5f862ebcf13fe1e5a SHA256 b3ea842e941c1ed3f22649122339fe98bb78db40ef14ae071abc9e3645f998a1 -MD5 438c2b225262ec84deda12b7fea76656 xorg-server-1.4-r2.ebuild 17809 -RMD160 b0cc1f1eb923daf0078d6379dd0916f3e463b628 xorg-server-1.4-r2.ebuild 17809 -SHA256 b3ea842e941c1ed3f22649122339fe98bb78db40ef14ae071abc9e3645f998a1 xorg-server-1.4-r2.ebuild 17809 -MISC ChangeLog 59755 RMD160 27493edf57c59ac8e05e949664b778132a325800 SHA1 449c861798dbbe2d239f46da85f82b84ad61b40e SHA256 259d9989e004d1303fd412b466e040af23f91b5665dc3417765c75cafa5b409d -MD5 6494101dd8bbceb31dc5556fe51c2990 ChangeLog 59755 -RMD160 27493edf57c59ac8e05e949664b778132a325800 ChangeLog 59755 -SHA256 259d9989e004d1303fd412b466e040af23f91b5665dc3417765c75cafa5b409d ChangeLog 59755 +EBUILD xorg-server-1.4-r2.ebuild 17847 RMD160 e8a0d50c9660aad789bbb3a8d883a9390f278706 SHA1 2befb74c5efbd691ce3b3ee568762ca6eb18ede3 SHA256 c72e2af5bcbc73c8641f3c6fad2c628025c32d00163aa2feb743fb216f786fca +MD5 a4296221c97990558fc93a519329aa46 xorg-server-1.4-r2.ebuild 17847 +RMD160 e8a0d50c9660aad789bbb3a8d883a9390f278706 xorg-server-1.4-r2.ebuild 17847 +SHA256 c72e2af5bcbc73c8641f3c6fad2c628025c32d00163aa2feb743fb216f786fca xorg-server-1.4-r2.ebuild 17847 +MISC ChangeLog 59891 RMD160 16f5f98704631cc1587bf75deb1369d5674567d8 SHA1 b4813bc15a344d8f9ea0d514a084a06d5b9d4422 SHA256 80d6ae44b87e284434835f212e1cae14d01bbdf4280fbe6b82504e8e9b8f4968 +MD5 16ba26dd1bec5b803365c5442414479e ChangeLog 59891 +RMD160 16f5f98704631cc1587bf75deb1369d5674567d8 ChangeLog 59891 +SHA256 80d6ae44b87e284434835f212e1cae14d01bbdf4280fbe6b82504e8e9b8f4968 ChangeLog 59891 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 @@ -148,7 +148,7 @@ SHA256 5ab16a882768bd84a26edb98b129ddd5ed9171f22e1fdfcc19ab97402d0cbcbe files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHAMyjXVaO67S1rtsRAmgaAKD55UvKUqeg7CErE+gQkD3JihFhgwCg2z0i -2hVEwDC6GZu2qtxsyx11Y5Q= -=D73e +iD8DBQFHAMz/XVaO67S1rtsRAuWcAJwKETfAU0xp8MGE3ZCexG2K5E7IUACbBjOQ +VB9gDWnFvPPJCLSo4F3GGm0= +=2KGp -----END PGP SIGNATURE----- diff --git a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild index bfa5a9a0b282..788e4a540c1e 100644 --- a/x11-base/xorg-server/xorg-server-1.4-r2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.1 2007/10/01 10:31:56 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r2.ebuild,v 1.2 2007/10/01 10:33:27 dberkholz Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -412,8 +412,8 @@ pkg_postinst() { pkg_postrm() { # Get rid of module dir to ensure opengl-update works properly if ! has_version x11-base/xorg-server; then - if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then - rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules + if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules fi fi } @@ -442,7 +442,7 @@ kdrive_setup() { # Check whether it's a valid kdrive server before we waste time # on the rest of this - if ! grep -q -o "\b${real_card}\b" ${S}/hw/kdrive/Makefile.am; then + if ! grep -q -o "\b${real_card}\b" "${S}"/hw/kdrive/Makefile.am; then continue fi @@ -480,7 +480,7 @@ kdrive_setup() { ebegin " ${real_card}" sed -i \ -e "s:\b${real_card}\b::g" \ - ${S}/hw/kdrive/Makefile.am \ + "${S}"/hw/kdrive/Makefile.am \ || die "sed of ${real_card} failed" eend fi @@ -492,7 +492,7 @@ kdrive_setup() { if ! use video_cards_siliconmotion && ! use video_cards_via; then sed -i \ -e "s:^\(VESA_SUBDIRS.*\)\\\:\1:g" \ - ${S}/hw/kdrive/Makefile.am + "${S}"/hw/kdrive/Makefile.am fi } @@ -501,9 +501,9 @@ dynamic_libgl_install() { ebegin "Moving GL files for dynamic switching" dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions local x="" - for x in ${D}/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do + for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libglx*; do if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions fi done eend 0 @@ -513,10 +513,10 @@ server_based_install() { use xprint && xprint_src_install if ! use xorg; then - rm ${D}/usr/share/man/man1/Xserver.1x \ - ${D}/usr/$(get_libdir)/xserver/SecurityPolicy \ - ${D}/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - ${D}/usr/share/man/man1/Xserver.1x + rm "${D}"/usr/share/man/man1/Xserver.1x \ + "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${D}"/usr/share/man/man1/Xserver.1x fi } @@ -532,21 +532,21 @@ switch_opengl_implem() { xprint_src_install() { # RH-style init script, we provide a wrapper exeinto /usr/$(get_libdir)/misc - doexe ${S}/hw/xprint/etc/init.d/xprint + doexe "${S}"/hw/xprint/etc/init.d/xprint # Install the wrapper - newinitd ${FILESDIR}/xprint.init xprint + newinitd "${FILESDIR}"/xprint.init xprint # Install profile scripts insinto /etc/profile.d - doins ${S}/hw/xprint/etc/profile.d/xprint* + doins "${S}"/hw/xprint/etc/profile.d/xprint* exeinto /etc/X11/xinit/xinitrc.d - doexe ${S}/hw/xprint/etc/Xsession.d/92xprint-xpserverlist + doexe "${S}"/hw/xprint/etc/Xsession.d/92xprint-xpserverlist # Patch profile scripts sed -e "s:/etc/init.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \ - get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \ - ${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist + get_xpserverlist:g" -i "${D}"/etc/profile.d/xprint* \ + "${D}"/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist # Move profile scripts, we can't touch /etc/profile.d/ in Gentoo - dodoc ${D}/etc/profile.d/xprint* - rm -f ${D}/etc/profile.d/xprint* + dodoc "${D}"/etc/profile.d/xprint* + rm -f "${D}"/etc/profile.d/xprint* } ensure_a_server_is_building() { |