From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MjVU2-000636-FT for garchives@archives.gentoo.org; Fri, 04 Sep 2009 09:53:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A19FE091A; Fri, 4 Sep 2009 15:02:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3E743E091A for ; Fri, 4 Sep 2009 15:02:01 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id E07F666BB1 for ; Fri, 4 Sep 2009 15:02:00 +0000 (UTC) Received: from scarabeus by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MjaIa-0001Y2-9J for gentoo-commits@lists.gentoo.org; Fri, 04 Sep 2009 15:02:00 +0000 From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ChangeLog ati-drivers-9.8.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog ati-drivers-9.8.ebuild X-VCS-Directories: x11-drivers/ati-drivers X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tomas Chvatal Date: Fri, 04 Sep 2009 15:02:00 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2774feb2-9baa-4046-973e-22cf2844346a X-Archives-Hash: 160979af5cdd005e5aae471cfe808b50 scarabeus 09/09/04 15:02:00 Modified: ChangeLog ati-drivers-9.8.ebuild Log: Adjust ebuild. Acpi is MANDATORY. Remove amd64 wrapping on multilib use= flag, just wasting space. (Portage version: 2.2_rc40/cvs/Linux x86_64) Revision Changes Path 1.183 x11-drivers/ati-drivers/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-dr= ivers/ChangeLog?rev=3D1.183&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-dr= ivers/ChangeLog?rev=3D1.183&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-dr= ivers/ChangeLog?r1=3D1.182&r2=3D1.183 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- ChangeLog 4 Sep 2009 13:50:42 -0000 1.182 +++ ChangeLog 4 Sep 2009 15:02:00 -0000 1.183 @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1= .182 2009/09/04 13:50:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1= .183 2009/09/04 15:02:00 scarabeus Exp $ + + 04 Sep 2009; Tom=C3=A1=C5=A1 Chv=C3=A1tal + ati-drivers-9.8.ebuild: + Adjust ebuild. Acpi is MANDATORY. Remove amd64 wrapping on multilib + useflag, just wasting space. =20 03 Sep 2009; Tom=C3=A1=C5=A1 Chv=C3=A1tal ati-drivers-9.8.ebuild: 1.14 x11-drivers/ati-drivers/ati-drivers-9.8.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-dr= ivers/ati-drivers-9.8.ebuild?rev=3D1.14&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-dr= ivers/ati-drivers-9.8.ebuild?rev=3D1.14&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-dr= ivers/ati-drivers-9.8.ebuild?r1=3D1.13&r2=3D1.14 Index: ati-drivers-9.8.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8= .ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ati-drivers-9.8.ebuild 4 Sep 2009 13:50:42 -0000 1.13 +++ ati-drivers-9.8.ebuild 4 Sep 2009 15:02:00 -0000 1.14 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9= .8.ebuild,v 1.13 2009/09/04 13:50:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9= .8.ebuild,v 1.14 2009/09/04 15:02:00 scarabeus Exp $ =20 EAPI=3D"2" =20 @@ -10,7 +10,7 @@ HOMEPAGE=3D"http://www.ati.com" ATI_URL=3D"https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/l= inux/" SRC_URI=3D"${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run" -IUSE=3D"acpi debug +modules multilib" +IUSE=3D"debug +modules multilib" =20 LICENSE=3D"AMD GPL-2 QPL-1.0 as-is" KEYWORDS=3D"~amd64 ~x86" @@ -20,14 +20,12 @@ !x11-drivers/ati-drivers:0 !x11-apps/ati-drivers-extra >=3Dapp-admin/eselect-opengl-1.0.7 + sys-power/acpid + x11-apps/xauth >=3Dx11-base/xorg-server-1.5.3-r7 x11-libs/libXinerama x11-libs/libXrandr - acpi? ( - sys-power/acpid - x11-apps/xauth - ) - amd64? ( multilib? ( app-emulation/emul-linux-x86-xlibs ) ) + multilib? ( app-emulation/emul-linux-x86-xlibs ) " =20 DEPEND=3D"${RDEPEND} @@ -231,21 +229,20 @@ "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \ || die "bin rm failed" =20 - if use acpi; then - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/common/etc/ati/authatieventsd.sh" \ - || die "sed failed." - - # Since "who" is in coreutils, we're using that one instead of "finger= ". - sed -i -e 's:finger:who:' \ - "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" = \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to = epatch powermode-opt-path-2.patch" - fi + # ACPI fixups + sed -i \ + -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ + -e "s:/var/lib/gdm/:/var/gdm/:" \ + "${S}/common/etc/ati/authatieventsd.sh" \ + || die "sed failed." + + # Since "who" is in coreutils, we're using that one instead of "finger"= . + sed -i -e 's:finger:who:' \ + "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ + || die "Replacing 'finger' with 'who' failed." + # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and + # add function to detect default state. + epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to e= patch powermode-opt-path-2.patch" =20 cd "${MODULE_DIR}" ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-= major-version) \ @@ -370,9 +367,7 @@ # Arch-specific files. # (s)bin. into /opt - if use acpi; then - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die - fi + dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die # We cleaned out the compilable stuff in src_unpack dobin "${ARCH_DIR}"/usr/X11R6/bin/* || die =20 @@ -390,10 +385,8 @@ insinto /etc/ati # Everything except for the authatieventsd.sh script. doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.defau= lt} - if use acpi; then - insopts -m0755 - doins common/etc/ati/authatieventsd.sh || die - fi + insopts -m0755 + doins common/etc/ati/authatieventsd.sh || die =20 # include. insinto /usr @@ -416,18 +409,16 @@ # doc. dohtml -r common/usr/share/doc/fglrx || die =20 - if use acpi; then - doman common/usr/share/man/man8/atieventsd.8 || die + doman common/usr/share/man/man8/atieventsd.8 || die =20 - pushd common/usr/share/doc/fglrx/examples/etc/acpi > /dev/null + pushd common/usr/share/doc/fglrx/examples/etc/acpi > /dev/null =20 - exeinto /etc/acpi - doexe ati-powermode.sh || die - insinto /etc/acpi/events - doins events/* || die + exeinto /etc/acpi + doexe ati-powermode.sh || die + insinto /etc/acpi/events + doins events/* || die =20 - popd > /dev/null - fi + popd > /dev/null =20 # Done with the "source" tree. Install tools we rebuilt: dobin extra/fgl_glxgears/fgl_glxgears || die @@ -441,12 +432,10 @@ newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma || die =20 # Gentoo-specific stuff: - if use acpi; then - newinitd "${FILESDIR}"/atieventsd.init atieventsd \ - || die "Failed to install atieventsd.init.d" - echo 'ATIEVENTSDOPTS=3D""' > "${T}"/atieventsd.conf - newconfd "${T}"/atieventsd.conf atieventsd || die - fi + newinitd "${FILESDIR}"/atieventsd.init atieventsd \ + || die "Failed to install atieventsd.init.d" + echo 'ATIEVENTSDOPTS=3D""' > "${T}"/atieventsd.conf + newconfd "${T}"/atieventsd.conf atieventsd || die } =20 src_install-libs() {