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 1Q9cbP-0004vN-N0 for garchives@archives.gentoo.org; Tue, 12 Apr 2011 12:21:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7FE01C004; Tue, 12 Apr 2011 12:21:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 871001C004 for ; Tue, 12 Apr 2011 12:21:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27C5F1B4122 for ; Tue, 12 Apr 2011 12:21:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 33F7C80065 for ; Tue, 12 Apr 2011 12:21:43 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <94b31dce073d48bfd7ca159e2a1119535c69bbf7.scarabeus@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 94b31dce073d48bfd7ca159e2a1119535c69bbf7 Date: Tue, 12 Apr 2011 12:21:43 +0000 (UTC) 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: X-Archives-Hash: f090a9d4fa3dac042b3b561e2591463b commit: 94b31dce073d48bfd7ca159e2a1119535c69bbf7 Author: Tomas Chvatal gentoo org> AuthorDate: Tue Apr 12 12:21:36 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Tue Apr 12 12:21:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D94b31dce [xorg-server] Convert nested condition into one. --- x11-base/xorg-server/xorg-server-9999.ebuild | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg= -server/xorg-server-9999.ebuild index 3674f34..4c4dcd0 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -219,10 +219,9 @@ pkg_postinst() { =20 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 - fi + if ! has_version x11-base/xorg-server && + [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules fi } =20