public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/x11:master commit in: x11-libs/libpciaccess/
@ 2011-04-15 19:04 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2011-04-15 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     9d796e86b13bee1aa94bc789336a01b92e4369d3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:32:41 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:32:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9d796e86

x11-libs/libpciaccess: Migrate to XORG_CONFIGURE_OPTIONS.

(Portage version: 2.2.0_alpha29_p5/git/Linux x86_64, signed Manifest commit with key 05DE07BB)

---
 x11-libs/libpciaccess/libpciaccess-9999.ebuild |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index 8c0fa91..f97750b 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -13,7 +13,9 @@ IUSE="minimal"
 DEPEND="!<x11-base/xorg-server-1.5"
 RDEPEND="${DEPEND}"
 
-CONFIGURE_OPTIONS="--with-pciids-path=/usr/share/misc"
+XORG_CONFIGURE_OPTIONS=(
+	--with-pciids-path=/usr/share/misc
+)
 
 src_install() {
 	xorg-2_src_install



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-libs/libpciaccess/
@ 2011-12-19  0:50 Chi-Thanh Christopher Nguyen
  0 siblings, 0 replies; 4+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-12-19  0:50 UTC (permalink / raw
  To: gentoo-commits

commit:     68531ff0ebe01928b1bf16f153e324ec7f36d506
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 00:49:52 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Dec 19 00:49:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=68531ff0

x11-libs/libpciaccess: sync with portage for bug #353699 and #354145.

---
 x11-libs/libpciaccess/libpciaccess-9999.ebuild |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index f97750b..03b57ca 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -6,20 +6,26 @@ EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal zlib"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="minimal"
-
-DEPEND="!<x11-base/xorg-server-1.5"
+DEPEND="!<x11-base/xorg-server-1.5
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
-XORG_CONFIGURE_OPTIONS=(
-	--with-pciids-path=/usr/share/misc
-)
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		"$(use_with zlib)"
+		"--with-pciids-path=${EPREFIX}/usr/share/misc"
+	)
+}
 
 src_install() {
 	xorg-2_src_install
 	if ! use minimal; then
-		dobin "${AUTOTOOLS_BUILD_DIR}"/scanpci/scanpci
+		dodir /usr/bin || die
+		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
 	fi
 }



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-libs/libpciaccess/
@ 2013-01-01 18:58 Matt Turner
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2013-01-01 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     991258ce5270f79c3227a389d1077cda1b5c3047
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jan  1 19:00:55 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Jan  1 19:00:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=991258ce

x11-libs/libpciaccess: Add sys-apps/hwids to RDEPEND, bug 445572

---
 x11-libs/libpciaccess/libpciaccess-9999.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index 4bedc0e..b5f88a3 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -11,7 +11,8 @@ IUSE="minimal zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
 	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
 
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/x11:master commit in: x11-libs/libpciaccess/
@ 2014-04-30 18:32 Michał Górny
  0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2014-04-30 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     2c7bf8226a4299cd4d5a254042d06876afb0b921
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 30 18:32:30 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 30 18:32:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2c7bf822

x11-libs/libpciaccess: Use multilib_src_install().

Package-Manager: portage-2.2.10

---
 x11-libs/libpciaccess/libpciaccess-9999.ebuild | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index a8669db..9f7e538 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -12,30 +12,24 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 IUSE="minimal zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
-	zlib? ( sys-libs/zlib )"
+	zlib? (	sys-libs/zlib[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
 	sys-apps/hwids"
 
-src_configure() {
+pkg_setup() {
+	xorg-2_pkg_setup
+
 	XORG_CONFIGURE_OPTIONS=(
 		"$(use_with zlib)"
 		"--with-pciids-path=${EPREFIX}/usr/share/misc"
 	)
-	xorg-2_src_configure
 }
 
-src_install() {
-	xorg-2_src_install
-
-	if ! use minimal; then
-		scanpci_install() {
-			${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" \
-				--mode=install "$(type -P install)" -c \
-				"${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" \
-				"${ED}"/usr/bin || die
-		}
+multilib_src_install() {
+	default
 
-		dodir /usr/bin || die
-		multilib_foreach_impl scanpci_install
+	if multilib_is_native_abi; then
+		dodir /usr/bin
+		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
 	fi
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-04-30 18:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-30 18:32 [gentoo-commits] proj/x11:master commit in: x11-libs/libpciaccess/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2013-01-01 18:58 Matt Turner
2011-12-19  0:50 Chi-Thanh Christopher Nguyen
2011-04-15 19:04 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox