[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2019-09-14 21:00 Sobhan Mohammadpour
  0 siblings, 0 replies; 10+ messages in thread
From: Sobhan Mohammadpour @ 2019-09-14 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     8e70712c5f69e4270a77c83c0d0ba8a92af93615
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 21:00:05 2019 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 21:00:05 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8e70712c

gnome-base/gnome-desktop: add 3.34

Package-Manager: Portage-2.3.76, Repoman-2.3.17

 .../files/3.34.0-make-seccomp-optional.patch       | 39 ++++++++++++++
 .../gnome-desktop/gnome-desktop-3.34.0.ebuild      | 62 ++++++++++++++++++++++
 gnome-base/gnome-desktop/metadata.xml              |  8 +++
 3 files changed, 109 insertions(+)

diff --git a/gnome-base/gnome-desktop/files/3.34.0-make-seccomp-optional.patch b/gnome-base/gnome-desktop/files/3.34.0-make-seccomp-optional.patch
new file mode 100644
index 00000000..9112e36c
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/3.34.0-make-seccomp-optional.patch
@@ -0,0 +1,39 @@
+From ecaf36f478d160618c1b9a23ed1c17f09a716c6f Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Sat, 14 Sep 2019 16:21:18 -0400
+Subject: [PATCH] make seccomp optional
+
+---
+ meson.build       | 2 +-
+ meson_options.txt | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6781ca7..9361f26 100644
+--- a/meson.build
++++ b/meson.build
+@@ -57,7 +57,7 @@ host_os = host_machine.system()
+ host_cpu = host_machine.cpu()
+ supported_os = ['linux']
+ unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64']
+-if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu)
++if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) and get_option('seccomp')
+   seccomp_dep = dependency('libseccomp')
+ else
+   seccomp_dep = dependency('', required: false)
+diff --git a/meson_options.txt b/meson_options.txt
+index e3402a1..a7e7f2e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -28,3 +28,8 @@ option('gtk_doc',
+ option('installed_tests',
+   type: 'boolean', value: false, description: 'Enable installed tests'
+ )
++
++option('seccomp',
++  type: 'boolean', value: true,
++  description: 'add seccomp support'
++)
+-- 
+2.23.0
+

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.0.ebuild
new file mode 100644
index 00000000..259eb8f2
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="3/17" # subslot = libgnome-desktop-3 soname version
+IUSE="debug doc +introspection gtk-doc seccomp udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.53.0:2
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.27.0
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	seccomp? ( sys-libs/libseccomp )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+	seccomp? ( sys-apps/bubblewrap )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	media-libs/fontconfig
+	app-text/yelp-tools
+"
+PATCHES=(
+	"${FILESDIR}/${PV}-make-seccomp-optional.patch"
+)
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		$(meson_use debug debug_tools)
+		-Dudev=$(usex udev enabled disabled)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use doc desktop_docs)
+		$(meson_use seccomp)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}

diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
new file mode 100644
index 00000000..996e7cac
--- /dev/null
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>


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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2019-02-23 20:37 Mart Raudsepp
  0 siblings, 0 replies; 10+ messages in thread
From: Mart Raudsepp @ 2019-02-23 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     9a54f9aedc9c3ab3bdce7ba7780d9d1102fd85fd
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 20:05:54 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 20:05:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9a54f9ae

gnome-base/gnome-desktop: remove, available in ::gentoo

Main tree version has additional ebuild and upstream fixes in the
3.26 versions, but now also has 3.30 available.
9999 here is too outdated and upstream moved 3.31 over to meson.

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 .../files/3.26.2-load-ld-so-cache.patch            |  12 ---
 .../gnome-desktop/gnome-desktop-3.26.2-r1.ebuild   |  64 ------------
 .../gnome-desktop/gnome-desktop-3.26.2.ebuild      |  61 -----------
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 112 ---------------------
 gnome-base/gnome-desktop/metadata.xml              |   8 --
 5 files changed, 257 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch b/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch
deleted file mode 100644
index ac81e1c7..00000000
--- a/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-index 99d83ac..72f4459 100644
---- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
-@@ -508,6 +508,7 @@ add_bwrap (GPtrArray   *array,
- 	    "--ro-bind", "/usr", "/usr",
- 	    "--ro-bind", "/lib", "/lib",
- 	    "--ro-bind", "/lib64", "/lib64",
-+	    "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
- 	    "--proc", "/proc",
- 	    "--dev", "/dev",
- 	    "--symlink", "usr/bin", "/bin",

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild
deleted file mode 100644
index 93c9caee..00000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-# automagic dependency on seccomp
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.53.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	seccomp? ( sys-libs/libseccomp )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.6
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-load-ld-so-cache.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable debug debug-tools) \
-		$(use_enable introspection) \
-		$(use_enable udev)
-}
-
-src_test() {
-	virtx emake check
-}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
deleted file mode 100644
index 87f30f65..00000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.26.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-# automagic dependency on seccomp
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.53.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	seccomp? ( sys-libs/libseccomp )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.6
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable debug debug-tools) \
-		$(use_enable introspection) \
-		$(use_enable udev)
-}
-
-src_test() {
-	virtx emake check
-}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
deleted file mode 100644
index 820f6c12..00000000
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2 gnome2-live
-fi
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="+introspection"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.33.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.6
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.4 )
-		app-text/yelp-tools"
-fi
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if [[ ${PV} = 9999 ]]; then
-		# pnp.ids are only provided with the gnome-desktop tarball;
-		# for the live version, we have to get them from hwdata git
-		unset gnome_desktop_LIVE_BRANCH
-		unset gnome_destkop_LIVE_COMMIT
-		unset gnome_desktop_LIVE_REPO
-		unset EGIT_BRANCH
-		unset EGIT_COMMIT
-		unset EGIT_DIR
-		unset EGIT_MASTER
-		EGIT_PROJECT="gnome-desktop_hwdata"
-		EGIT_REPO_URI="git://git.fedorahosted.org/hwdata.git"
-		EGIT_SOURCEDIR="${WORKDIR}/hwdata"
-		git-2_src_unpack
-		ln -sf "${WORKDIR}/hwdata/pnp.ids" "${S}/libgnome-desktop/" ||
-			die "ln -sf failed"
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	if [[ ${PV} = 9999 ]]; then
-		myconf="${myconf} $(use_enable doc gtk-doc)"
-	else
-		myconf="${myconf} ITSTOOL=$(type -P true)"
-	fi
-
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
-	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	gnome2_src_configure \
-		--disable-debug-tools \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(use_enable introspection) \
-		${myconf}
-}
-
-src_test() {
-	# Makes unittest fail without this locale installed
-	rm "${S}"/tests/he_IL* || die
-
-	Xemake check
-}

diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
deleted file mode 100644
index 996e7cac..00000000
--- a/gnome-base/gnome-desktop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>


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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2018-11-16 17:25 Gilles Dartiguelongue
  0 siblings, 0 replies; 10+ messages in thread
From: Gilles Dartiguelongue @ 2018-11-16 17:25 UTC (permalink / raw
  To: gentoo-commits

commit:     8b53f1d94092e8fa279539f49222ea3ddd001177
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 17:24:22 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 17:24:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8b53f1d9

gnome-base/gnome-desktop: load ld.so.conf in sandbox

Closes: https://bugs.gentoo.org/654096
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 .../files/3.26.2-load-ld-so-cache.patch            | 12 ++++
 .../gnome-desktop/gnome-desktop-3.26.2-r1.ebuild   | 64 ++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch b/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch
new file mode 100644
index 00000000..ac81e1c7
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch
@@ -0,0 +1,12 @@
+diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
+index 99d83ac..72f4459 100644
+--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
+@@ -508,6 +508,7 @@ add_bwrap (GPtrArray   *array,
+ 	    "--ro-bind", "/usr", "/usr",
+ 	    "--ro-bind", "/lib", "/lib",
+ 	    "--ro-bind", "/lib64", "/lib64",
++	    "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
+ 	    "--proc", "/proc",
+ 	    "--dev", "/dev",
+ 	    "--symlink", "usr/bin", "/bin",

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild
new file mode 100644
index 00000000..93c9caee
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 virtualx
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="3/12" # subslot = libgnome-desktop-3 soname version
+IUSE="debug +introspection seccomp udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+# automagic dependency on seccomp
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.53.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	seccomp? ( sys-libs/libseccomp )
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.6
+	dev-util/itstool
+	sys-devel/gettext
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-load-ld-so-cache.patch
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-distributor=Gentoo \
+		--enable-desktop-docs \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable debug debug-tools) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_test() {
+	virtx emake check
+}


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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2012-11-21 22:27 Gilles Dartiguelongue
  0 siblings, 0 replies; 10+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-21 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4887a6c69f09500245a247528eea87af0565537d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 21 22:13:54 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 21 22:13:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4887a6c6

gnome-base/gnome-desktop: 3.6.1 → 3.6.2

---
 gnome-base/gnome-desktop/files/pnp.ids.r1          | 2029 --------------------
 ...top-3.6.1.ebuild => gnome-desktop-3.6.2.ebuild} |   12 +-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |   10 +-
 gnome-base/gnome-desktop/metadata.xml              |    9 +
 4 files changed, 20 insertions(+), 2040 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/pnp.ids.r1 b/gnome-base/gnome-desktop/files/pnp.ids.r1
deleted file mode 100644
index 1e1e570..0000000
--- a/gnome-base/gnome-desktop/files/pnp.ids.r1
+++ /dev/null
@@ -1,2029 +0,0 @@
-AAE	Anatek Electronics Inc.
-AAT	Ann Arbor Technologies
-ABA	ABBAHOME INC.
-ABC	AboCom System Inc
-ABD	Allen Bradley Company
-ABE	Alcatel Bell
-ABO	D-Link Systems Inc
-ABT	Anchor Bay Technologies, Inc.
-ABV	Advanced Research Technology
-ACA	Ariel Corporation
-ACB	Aculab Ltd
-ACC	Accton Technology Corporation
-ACD	AWETA BV
-ACE	Actek Engineering Pty Ltd
-ACG	A&R Cambridge Ltd
-ACH	Archtek Telecom Corporation
-ACI	Ancor Communications Inc
-ACK	Acksys
-ACL	Apricot Computers
-ACM	Acroloop Motion Control Systems Inc
-ACO	Allion Computer Inc.
-ACP	Aspen Tech Inc
-ACR	Acer Technologies
-ACS	Altos Computer Systems
-ACT	Applied Creative Technology
-ACU	Acculogic
-ACV	ActivCard S.A
-ADA	Addi-Data GmbH
-ADB	Aldebbaron
-ADC	Acnhor Datacomm
-ADD	Advanced Peripheral Devices Inc
-ADE	Arithmos, Inc.
-ADH	Aerodata Holdings Ltd
-ADI	ADI Systems Inc
-ADK	Adtek System Science Company Ltd
-ADL	ASTRA Security Products Ltd
-ADM	Ad Lib MultiMedia Inc
-ADN	Analog & Digital Devices Tel. Inc
-ADP	Adaptec Inc
-ADR	Nasa Ames Research Center
-ADS	Analog Devices Inc
-ADT	Adtek
-ADT	Aved Display Technologies
-ADV	Advanced Micro Devices Inc
-ADX	Adax Inc
-AEC	Antex Electronics Corporation
-AED	Advanced Electronic Designs, Inc.
-AEI	Actiontec Electric Inc
-AEJ	Alpha Electronics Company
-AEM	ASEM S.p.A.
-AEP	Aetas Peripheral International
-AET	Aethra Telecomunicazioni S.r.l.
-AFA	Alfa Inc
-AGC	Beijing Aerospace Golden Card Electronic Engineering Co.,Ltd.
-AGI	Artish Graphics Inc
-AGL	Argolis
-AGM	Advan Int'l Corporation
-AGT	Agilent Technologies
-AHC	Advantech Co., Ltd.
-AIC	Arnos Insturments & Computer Systems
-AIE	Altmann Industrieelektronik
-AII	Amptron International Inc.
-AIL	Altos India Ltd
-AIM	AIMS Lab Inc
-AIR	Advanced Integ. Research Inc
-AIS	Alien Internet Services
-AIW	Aiwa Company Ltd
-AIX	ALTINEX, INC.
-AJA	AJA Video Systems, Inc.
-AKB	Akebia Ltd
-AKI	AKIA Corporation
-AKL	AMiT Ltd
-AKM	Asahi Kasei Microsystems Company Ltd
-AKP	Atom Komplex Prylad
-AKY	Askey Computer Corporation
-ALA	Alacron Inc
-ALC	Altec Corporation
-ALD	In4S Inc
-ALG	Realtek Semiconductor Corp.
-ALH	AL Systems
-ALI	Acer Labs
-ALJ	Altec Lansing
-ALK	Acrolink Inc
-ALL	Alliance Semiconductor Corporation
-ALM	Acutec Ltd.
-ALN	Alana Technologies
-ALO	Algolith Inc.
-ALP	Alps Electric Company Ltd
-ALR	Advanced Logic
-ALS	Avance Logic Inc
-ALT	Altra
-ALV	AlphaView LCD
-ALX	ALEXON Co.,Ltd.
-AMA	Asia Microelectronic Development Inc
-AMB	Ambient Technologies, Inc.
-AMC	Attachmate Corporation
-AMD	Amdek Corporation
-AMI	American Megatrends Inc
-AML	Anderson Multimedia Communications (HK) Limited
-AMN	Amimon LTD.
-AMP	AMP Inc
-AMT	AMT International Industry
-AMX	AMX LLC
-ANA	Anakron
-ANC	Ancot
-AND	Adtran Inc
-ANI	Anigma Inc
-ANK	Anko Electronic Company Ltd
-ANL	Analogix Semiconductor, Inc
-ANO	Anorad Corporation
-ANP	Andrew Network Production
-ANR	ANR Ltd
-ANS	Ansel Communication Company
-ANT	Ace CAD Enterprise Company Ltd
-ANX	Acer Netxus Inc
-AOA	AOpen Inc.
-AOE	Advanced Optics Electronics, Inc.
-AOL	America OnLine
-AOT	Alcatel
-APC	American Power Conversion
-APD	AppliAdata
-APG	Horner Electric Inc
-API	A Plus Info Corporation
-APL	Aplicom Oy
-APM	Applied Memory Tech
-APN	Appian Tech Inc
-APP	Apple Computer Inc
-APR	Aprilia s.p.a.
-APS	Autologic Inc
-APT	Audio Processing Technology Ltd
-APX	AP Designs Ltd
-ARC	Alta Research Corporation
-ARE	ICET S.p.A.
-ARG	Argus Electronics Co., LTD
-ARI	Argosy Research Inc
-ARK	Ark Logic Inc
-ARL	Arlotto Comnet Inc
-ARM	Arima
-ARO	Poso International B.V.
-ARS	Arescom Inc
-ART	Corion Industrial Corporation
-ASC	Ascom Strategic Technology Unit
-ASD	USC Information Sciences Institute
-ASE	AseV Display Labs
-ASI	Ahead Systems
-ASK	Ask A/S
-ASL	AccuScene Corporation Ltd
-ASM	ASEM S.p.A.
-ASN	Asante Tech Inc
-ASP	ASP Microelectronics Ltd
-AST	AST Research Inc
-ASU	Asuscom Network Inc
-ASX	AudioScience
-ASY	Rockwell Collins / Airshow Systems
-ATA	Allied Telesyn International (Asia) Pte Ltd
-ATC	Ably-Tech Corporation
-ATD	Alpha Telecom Inc
-ATE	Innovate Ltd
-ATH	Athena Informatica S.R.L.
-ATI	Allied Telesis KK
-ATK	Allied Telesyn Int'l
-ATL	Arcus Technology Ltd
-ATM	ATM Ltd
-ATN	Athena Smartcard Solutions Ltd.
-ATO	ASTRO DESIGN, INC.
-ATP	Alpha-Top Corporation
-ATT	AT&T
-ATV	Office Depot, Inc.
-ATX	Athenix Corporation
-AUI	Alps Electric Inc
-AUO	AU Optronics
-AUR	Aureal Semiconductor
-AUT	Autotime Corporation
-AVA	Avaya Communication
-AVC	Auravision Corporation
-AVD	Avid Electronics Corporation
-AVE	Add Value Enterpises (Asia) Pte Ltd
-AVI	Nippon Avionics Co.,Ltd
-AVM	AVM GmbH
-AVO	Avocent Corporation
-AVT	Avtek (Electronics) Pty Ltd
-AVV	SBS Technologies (Canada), Inc. (was Avvida Systems, Inc.)
-AWC	Access Works Comm Inc
-AWL	Aironet Wireless Communications, Inc
-AWS	Wave Systems
-AXB	Adrienne Electronics Corporation
-AXC	AXIOMTEK CO., LTD.
-AXE	D-Link Systems Inc (used as 2nd pnpid)
-AXI	American Magnetics
-AXL	Axel
-AXP	American Express
-AXT	Axtend Technologies Inc
-AXX	Axxon Computer Corporation
-AXY	AXYZ Automation Services, Inc
-AYD	Aydin Displays
-AYR	Airlib, Inc
-AZM	AZ Middelheim - Radiotherapy
-AZT	Aztech Systems Ltd
-BAC	Biometric Access Corporation
-BAN	Banyan
-BBB	an-najah university
-BBH	B&Bh
-BBL	Brain Boxes Limited
-BCC	Beaver Computer Corporaton
-BCD	Dr. Seufert GmbH
-BCM	Broadcom
-BCQ	Deutsche Telekom Berkom GmbH
-BCS	Booria CAD/CAM systems
-BDO	Brahler ICS
-BDR	Blonder Tongue Labs, Inc.
-BDS	Barco Display Systems
-BEC	Elektro Beckhoff GmbH
-BEI	Beckworth Enterprises Inc
-BEK	Beko Elektronik A.S.
-BEL	Beltronic Industrieelektronik GmbH
-BEO	Baug & Olufsen
-BFE	B.F. Engineering Corporation
-BGB	Barco Graphics N.V
-BGT	Budzetron Inc
-BHZ	BitHeadz, Inc.
-BIC	Big Island Communications
-BII	Boeckeler Instruments Inc
-BIL	Billion Electric Company Ltd
-BIO	BioLink Technologies International, Inc.
-BIT	Bit 3 Computer
-BLI	Busicom
-BLN	BioLink Technologies
-BLP	Bloomberg L.P.
-BMI	Benson Medical Instruments Company
-BML	BIOMED Lab
-BMS	BIOMEDISYS
-BNE	Bull AB
-BNK	Banksia Tech Pty Ltd
-BNO	Bang & Olufsen
-BNS	Boulder Nonlinear Systems
-BOB	Rainy Orchard
-BOE	BOE
-BOS	BOS
-BPD	Micro Solutions, Inc.
-BPU	Best Power
-BRC	BARC
-BRG	Bridge Information Co., Ltd
-BRI	Boca Research Inc
-BRM	Braemar Inc
-BRO	BROTHER INDUSTRIES,LTD.
-BSE	Bose Corporation
-BSL	Biomedical Systems Laboratory
-BST	BodySound Technologies, Inc.
-BTC	Bit 3 Computer
-BTE	Brilliant Technology
-BTF	Bitfield Oy
-BTI	BusTech Inc
-BUF	Yasuhiko Shirai Melco Inc
-BUJ	ATI Tech Inc
-BUL	Bull
-BUR	Bernecker & Rainer Ind-Eletronik GmbH
-BUS	BusTek
-BUT	21ST CENTURY ENTERTAINMENT
-BWK	Bitworks Inc.
-BXE	Buxco Electronics
-BYD	byd:sign corporation
-CAA	Castles Automation Co., Ltd
-CAC	CA & F Elettronica
-CAG	CalComp
-CAI	Canon Inc.
-CAL	Acon
-CAM	Cambridge Audio
-CAN	Canopus Company Ltd
-CAN	Carrera Computer Inc
-CAN	CORNEA
-CAR	Cardinal Company Ltd
-CAS	CASIO COMPUTER CO.,LTD
-CAT	Consultancy in Advanced Technology
-CBI	ComputerBoards Inc
-CBR	Cebra Tech A/S
-CBX	Cybex Computer Products Corporation
-CCC	C-Cube Microsystems
-CCI	Cache
-CCJ	CONTEC CO.,LTD.
-CCL	CCL/ITRI
-CCP	Capetronic USA Inc
-CDC	Core Dynamics Corporation
-CDD	Convergent Data Devices
-CDE	Colin.de
-CDG	Christie Digital Systems Inc
-CDI	Concept Development Inc
-CDK	Cray Communications
-CDN	Codenoll Technical Corporation
-CDP	CalComp
-CDS	Computer Diagnostic Systems
-CDT	IBM Corporation
-CDV	Convergent Design Inc.
-CEA	Consumer Electronics Association
-CEC	Chicony Electronics Company Ltd
-CED	Cambridge Electronic Design Ltd
-CEF	Cefar Digital Vision
-CEI	Crestron Electronics, Inc.
-CEM	MEC Electronics GmbH
-CEN	Centurion Technologies P/L
-CEP	C-DAC
-CER	Ceronix
-CET	TEC CORPORATION
-CFG	Atlantis
-CGA	Chunghwa Picture Tubes, LTD
-CGS	Chyron Corp
-CHA	Chase Research PLC
-CHC	Chic Technology Corp.
-CHD	ChangHong Electric Co.,Ltd
-CHE	Acer Inc
-CHG	Sichuan Changhong Electric CO, LTD.
-CHI	Chrontel Inc
-CHL	Chloride-R&D
-CHM	CHIC TECHNOLOGY CORP.
-CHO	Sichuang Changhong Corporation
-CHP	CH Products
-CHS	Agentur Chairos
-CHT	Chunghwa Picture Tubes,LTD.
-CHY	Cherry GmbH
-CIC	Comm. Intelligence Corporation
-CII	Cromack Industries Inc
-CIL	Citicom Infotech Private Limited
-CIN	Citron GmbH
-CIP	Ciprico Inc
-CIR	Cirrus Logic Inc
-CIS	Cisco Systems Inc
-CIT	Citifax Limited
-CKC	The Concept Keyboard Company Ltd
-CLA	Clarion Company Ltd
-CLD	COMMAT L.t.d.
-CLE	Classe Audio
-CLG	CoreLogic
-CLI	Cirrus Logic Inc
-CLM	CrystaLake Multimedia
-CLO	Clone Computers
-CLT	automated computer control systems
-CLV	Clevo Company
-CLX	CardLogix
-CMC	CMC Ltd
-CMD	Colorado MicroDisplay, Inc.
-CMG	Chenming Mold Ind. Corp.
-CMI	C-Media Electronics
-CMM	Comtime GmbH
-CMO	Chi Mei Optoelectronics corp.
-CMR	Cambridge Research Systems Ltd
-CMS	CompuMaster Srl
-CMX	Comex Electronics AB
-CNB	American Power Conversion
-CNC	Alvedon Computers Ltd
-CNE	Cine-tal
-CNI	Connect Int'l A/S
-CNN	Canon Inc
-CNT	COINT Multimedia Systems
-COB	COBY Electronics Co., Ltd
-COD	CODAN Pty. Ltd.
-COI	Codec Inc.
-COL	Rockwell Collins, Inc.
-COM	Comtrol Corporation
-CON	Contec Company Ltd
-COR	Corollary Inc
-COS	CoStar Corporation
-COT	Core Technology Inc
-COW	Polycow Productions
-CPC	Ciprico Inc
-CPD	CompuAdd
-CPI	Computer Peripherals Inc
-CPL	Compal Electronics Inc
-CPQ	Compaq Computer Company
-CPT	cPATH
-CPX	Powermatic Data Systems
-CRC	CONRAC GmbH
-CRD	Cardinal Technical Inc
-CRE	Creative Labs Inc
-CRI	Crio Inc.
-CRL	Creative Logic  
-CRN	Cornerstone Imaging
-CRO	Extraordinary Technologies PTY Limited
-CRQ	Cirque Corporation
-CRS	Crescendo Communication Inc
-CRX	Cyrix Corporation
-CSB	Transtex SA
-CSC	Crystal Semiconductor
-CSD	Cresta Systems Inc
-CSE	Concept Solutions & Engineering
-CSI	Cabletron System Inc
-CSO	California Institute of Technology
-CSS	CSS Laboratories
-CST	CSTI Inc
-CTA	CoSystems Inc
-CTC	CTC Communication Development Company Ltd
-CTE	Chunghwa Telecom Co., Ltd.
-CTL	Creative Technology Ltd
-CTM	Computerm Corporation
-CTN	Computone Products
-CTP	Computer Technology Corporation
-CTS	Comtec Systems Co., Ltd.
-CTX	Creatix Polymedia GmbH
-CUB	Cubix Corporation
-CUK	Calibre UK Ltd
-CVS	Clarity Visual Systems
-CWR	Connectware Inc
-CXT	Conexant Systems
-CYB	CyberVision
-CYC	Cylink Corporation
-CYD	Cyclades Corporation
-CYL	Cyberlabs
-CYT	Cytechinfo Inc
-CYV	Cyviz AS
-CYW	Cyberware
-CYX	Cyrix Corporation
-DAC	Digital Acoustics Corporation
-DAE	Digatron Industrie Elektronik GmbH
-DAI	DAIS SET Ltd.
-DAK	Daktronics
-DAL	Digital Audio Labs Inc
-DAS	DAVIS AS
-DAT	Datel Inc
-DAU	Daou Tech Inc
-DAV	Davicom Semiconductor Inc
-DAW	DA2 Technologies Inc
-DAX	Data Apex Ltd
-DBD	Diebold Inc.
-DBI	DigiBoard Inc
-DBK	Databook Inc
-DBL	Doble Engineering Company
-DBN	DB Networks Inc
-DCA	Digital Communications Association
-DCC	Dale Computer Corporation
-DCD	Datacast LLC
-DCE	dSPACE GmbH
-DCI	Concepts Inc
-DCL	Dynamic Controls Ltd
-DCM	DCM Data Products
-DCO	Dialogue Technology Corporation
-DCR	Decros Ltd
-DCS	Diamond Computer Systems Inc
-DCT	Dancall Telecom A/S
-DCV	Datatronics Technology Inc
-DDA	DA2 Technologies Corporation
-DDD	Danka Data Devices
-DDI	Data Display AG
-DDS	Barco, n.v.
-DDT	Datadesk Technologies Inc
-DEC	Digital Equipment Corporation
-DEI	Deico Electronics
-DEL	Dell
-DEN	Densitron Computers Ltd
-DEX	idex displays
-DFI	DFI
-DFK	SharkTec A/S
-DGA	Digiital Arts Inc
-DGC	Data General Corporation
-DGI	DIGI International
-DGK	DugoTech Co., LTD
-DGP	Digicorp European sales S.A.
-DGS	Diagsoft Inc
-DGT	Dearborn Group Technology
-DGT	The Dearborn Group
-DHP	DH Print
-DHQ	Quadram
-DHT	Projectavision Inc
-DIA	Diadem
-DIG	Digicom S.p.A.
-DII	Dataq Instruments Inc
-DIM	dPict Imaging, Inc.
-DIN	Daintelecom Co., Ltd
-DIS	Diseda S.A.
-DIT	Dragon Information Technology
-DJE	Capstone Visual Product Development
-DJP	Maygay Machines, Ltd
-DKY	Datakey Inc
-DLC	Diamond Lane Comm. Corporation
-DLG	Digital-Logic GmbH
-DLK	D-Link Systems Inc
-DLT	Digitelec Informatique Park Cadera
-DMB	Digicom Systems Inc
-DMC	Dune Microsystems Corporation
-DMM	Dimond Multimedia Systems Inc
-DMP	D&M Holdings Inc, Professional Business Company
-DMS	DOME imaging systems
-DMV	NDS Ltd
-DNA	DNA Enterprises, Inc.
-DNG	Apache Micro Peripherals Inc
-DNI	Deterministic Networks Inc.
-DNT	Dr. Neuhous Telekommunikation GmbH
-DNV	DiCon
-DOL	Dolman Technologies Group Inc
-DOM	Dome Imaging Systems
-DON	DENON, Ltd.
-DOT	Dotronic Mikroelektronik GmbH
-DPA	DigiTalk Pro AV
-DPC	Delta Electronics Inc
-DPI	DocuPoint
-DPL	Digital Projection Limited
-DPM	ADPM Synthesis sas
-DPS	Digital Processing Systems
-DPT	DPT
-DPX	DpiX, Inc.
-DQB	Datacube Inc
-DRB	Dr. Bott KG
-DRC	Data Ray Corp.
-DRD	DIGITAL REFLECTION INC.
-DRI	Data Race Inc
-DSD	DS Multimedia Pte Ltd
-DSI	Digitan Systems Inc
-DSM	DSM Digital Services GmbH
-DSP	Domain Technology Inc
-DTA	DELTATEC
-DTC	DTC Tech Corporation
-DTI	Diversified Technology, Inc.
-DTK	Dynax Electronics (HK) Ltd
-DTL	e-Net Inc
-DTN	Datang Telephone Co
-DTO	Deutsche Thomson OHG
-DTX	Data Translation
-DUA	Dosch & Amand GmbH & Company KG
-DUN	NCR Corporation
-DVD	Dictaphone Corporation
-DVL	Devolo AG
-DVS	Digital Video System
-DVT	Data Video
-DWE	Daewoo Electronics Company Ltd
-DXC	Digipronix Control Systems
-DXP	Data Expert Corporation
-DXS	Signet
-DYC	Dycam Inc
-DYM	Dymo-CoStar Corporation
-DYN	Askey Computer Corporation
-DYX	Dynax Electronics (HK) Ltd
-EAS	Evans and Sutherland Computer
-EBH	Data Price Informatica
-EBT	HUALONG TECHNOLOGY CO., LTD
-ECA	Electro Cam Corp.
-ECC	ESSential Comm. Corporation
-ECI	Enciris Technologies
-ECK	Eugene Chukhlomin Sole Proprietorship, d.b.a.
-ECL	Excel Company Ltd
-ECM	E-Cmos Tech Corporation
-ECO	Echo Speech Corporation
-ECP	Elecom Company Ltd
-ECS	Elitegroup Computer Systems Company Ltd
-ECT	Enciris Technologies
-EDC	e.Digital Corporation
-EDG	Electronic-Design GmbH
-EDI	Edimax Tech. Company Ltd
-EDM	EDMI
-EEE	ET&T Technology Company Ltd
-EEH	EEH Datalink GmbH
-EEP	E.E.P.D. GmbH
-EES	EE Solutions, Inc.
-EGD	EIZO GmbH Display Technologies
-EGL	Eagle Technology
-EGN	Egenera, Inc.
-EGO	Ergo Electronics
-EHJ	Epson Research
-EIC	Eicon Technology Corporation
-EKA	MagTek Inc.
-EKC	Eastman Kodak Company
-EKS	EKSEN YAZILIM
-ELA	ELAD srl
-ELC	Electro Scientific Ind
-ELE	Elecom Company Ltd
-ELG	Elmeg GmbH Kommunikationstechnik
-ELI	Edsun Laboratories
-ELL	Electrosonic Ltd
-ELM	Elmic Systems Inc
-ELO	Elo TouchSystems Inc
-ELO	Tyco Electronics
-ELS	ELSA GmbH
-ELT	Element Labs, Inc.
-ELX	Elonex PLC
-EMB	Embedded computing inc ltd
-EMC	eMicro Corporation
-EME	EMiNE TECHNOLOGY COMPANY, LTD.
-EMG	EMG Consultants Inc
-EMI	Ex Machina Inc
-EMU	Emulex Corporation
-ENC	Eizo Nanao Corporation
-END	ENIDAN Technologies Ltd
-ENE	ENE Technology Inc.
-ENI	Efficient Networks
-ENS	Ensoniq Corporation
-ENT	Enterprise Comm. & Computing Inc
-EPC	Empac
-EPI	Envision Peripherals, Inc
-EPN	EPiCON Inc.
-EPS	KEPS
-EQP	Equipe Electronics Ltd.
-EQX	Equinox Systems Inc
-ERG	Ergo System
-ERI	Ericsson Mobile Communications AB
-ERN	Ericsson, Inc.
-ERP	Euraplan GmbH
-ERT	Escort Insturments Corporation
-ESC	Eden Sistemas de Computacao S/A
-ESG	ELCON Systemtechnik GmbH
-ESI	Extended Systems, Inc.
-ESK	ES&S
-ESS	ESS Technology Inc
-EST	Embedded Solution Technology
-ESY	E-Systems Inc
-ETC	Everton Technology Company Ltd
-ETI	Eclipse Tech Inc
-ETK	eTEK Labs Inc.
-ETL	Evertz Microsystems Ltd.
-ETS	Electronic Trade Solutions Ltd
-ETT	E-Tech Inc
-EUT	Ericsson Mobile Networks B.V.
-EVI	eviateg GmbH
-EVX	Everex
-EXA	Exabyte
-EXC	Excession Audio
-EXI	Exide Electronics
-EXN	RGB Systems, Inc. dba Extron Electronics
-EXP	Data Export Corporation
-EXT	Exatech Computadores & Servicos Ltda
-EXX	Exxact GmbH
-EXY	Exterity Ltd
-EZE	EzE Technologies
-EZP	Storm Technology
-FAR	Farallon Computing
-FBI	Interface Corporation
-FCB	Furukawa Electric Company Ltd
-FCG	First International Computer Ltd
-FCS	Focus Enhancements, Inc.
-FDC	Future Domain
-FDT	Fujitsu Display Technologies Corp.
-FEC	FURUNO ELECTRIC CO., LTD.
-FEL	Fellowes & Questec
-FER	Ferranti Int'L
-FFI	Fairfield Industries
-FGD	Lisa Draexlmaier GmbH
-FGL	Fujitsu General Limited.
-FHL	FHLP
-FIC	Formosa Industrial Computing Inc
-FIL	Forefront Int'l Ltd
-FIN	Finecom Co., Ltd.
-FIR	Chaplet Systems Inc
-FIS	FLY-IT Simulators
-FJC	Fujitsu Takamisawa Component Limited
-FJS	Fujitsu Spain
-FJT	F.J. Tieman BV
-FLI	Faroudja Laboratories
-FLY	Butterfly Communications
-FMA	Fast Multimedia AG
-FMC	Ford Microelectronics Inc
-FMI	Fellowes, Inc.
-FMI	Fujitsu Microelect Inc
-FML	Fujitsu Microelect Ltd
-FMZ	Formoza-Altair
-FNC	Fanuc LTD
-FNI	Funai Electric Co., Ltd.
-FOA	FOR-A Company Limited
-FOS	Foss Tecator
-FPE	Fujitsu Peripherals Ltd
-FPS	Deltec Corporation
-FPX	Cirel Systemes
-FRC	Force Computers
-FRD	Freedom Scientific BLV
-FRE	Forvus Research Inc
-FRI	Fibernet Research Inc
-FRS	South Mountain Technologies, LTD
-FSC	Future Systems Consulting KK
-FSI	Fore Systems Inc
-FST	Modesto PC Inc
-FTC	Futuretouch Corporation
-FTE	Frontline Test Equipment Inc.
-FTG	FTG Data Systems
-FTI	FastPoint Technologies, Inc.
-FTN	Fountain Technologies Inc
-FTR	Mediasonic
-FUJ	Fujitsu Ltd
-FUN	sisel muhendislik
-FUS	Fujitsu Siemens Computers GmbH
-FVC	First Virtual Corporation
-FVX	C-C-C Group Plc
-FWR	Flat Connections Inc
-FXX	Fuji Xerox
-FZC	Founder Group Shenzhen Co.
-FZI	FZI Forschungszentrum Informatik
-GAG	Gage Applied Sciences Inc
-GAL	Galil Motion Control
-GAU	Gaudi Co., Ltd.
-GCC	GCC Technologies Inc
-GCI	Gateway Comm. Inc
-GCS	Grey Cell Systems Ltd
-GDC	General Datacom
-GDI	G. Diehl ISDN GmbH
-GDS	GDS
-GDT	Vortex Computersysteme GmbH
-GEF	GE Fanuc Embedded Systems
-GEM	Gem Plus
-GEN	Genesys ATE Inc
-GEO	GEO Sense
-GES	GES Singapore Pte Ltd
-GFM	GFMesstechnik GmbH
-GFN	Gefen Inc.
-GIC	General Inst. Corporation
-GIM	Guillemont International
-GIS	AT&T Global Info Solutions
-GJN	Grand Junction Networks
-GLE	AD electronics
-GLM	Genesys Logic
-GLS	Gadget Labs LLC
-GMK	GMK Electronic Design GmbH
-GML	General Information Systems
-GMM	GMM Research Inc
-GMN	GEMINI 2000 Ltd
-GMX	GMX Inc
-GND	Gennum Corporation
-GNN	GN Nettest Inc
-GNZ	Gunze Ltd
-GRA	Graphica Computer
-GRE	GOLD RAIN ENTERPRISES CORP.
-GRH	Granch Ltd
-GRV	Advanced Gravis
-GRY	Robert Gray Company
-GSB	NIPPONDENCHI CO,.LTD
-GSC	General Standards Corporation
-GSM	Goldstar Company Ltd
-GST	Graphic SystemTechnology
-GSY	Grossenbacher Systeme AG
-GTC	Graphtec Corporation
-GTI	Goldtouch
-GTK	G-Tech Corporation
-GTM	Garnet System Company Ltd
-GTS	Geotest Marvin Test Systems Inc
-GTT	General Touch Technology Co., Ltd.
-GUD	Guntermann & Drunck GmbH
-GUZ	Guzik Technical Enterprises
-GVC	GVC Corporation
-GVL	Global Village Communication
-GWI	GW Instruments
-GWY	Gateway 2000
-GZE	GUNZE Limited
-HAE	Haider electronics
-HAI	Haivision Systems Inc.
-HAL	Halberthal
-HAN	Hanchang System Corporation
-HAY	Hayes Microcomputer Products Inc
-HCA	DAT
-HCL	HCL America Inc
-HCM	HCL Peripherals
-HCP	Hitachi Computer Products Inc
-HCW	Hauppauge Computer Works Inc
-HDC	HardCom Elektronik & Datateknik
-HDI	HD-INFO d.o.o.
-HDV	Holografika kft.
-HEC	Hisense Electric Co., Ltd.
-HEC	Hitachi Engineering Company Ltd
-HEL	Hitachi Micro Systems Europe Ltd
-HER	Ascom Business Systems
-HET	HETEC Datensysteme GmbH
-HHC	HIRAKAWA HEWTECH CORP.
-HIB	Hibino Corporation
-HIC	Hitachi Information Technology Co., Ltd.
-HIK	Hikom Co., Ltd.
-HIL	Hilevel Technology
-HIT	Hitachi America Ltd
-HJI	Harris & Jeffries Inc
-HKA	HONKO MFG. CO., LTD.
-HKG	Josef Heim KG
-HMC	Hualon Microelectric Corporation
-HMK	hmk Daten-System-Technik BmbH
-HMX	HUMAX Co., Ltd.
-HNS	Hughes Network Systems
-HOB	HOB Electronic GmbH
-HOE	Hosiden Corporation
-HOL	Holoeye Photonics AG
-HPC	Hewlett Packard Co.
-HPD	Hewlett Packard
-HPI	Headplay, Inc.
-HPK	HAMAMATSU PHOTONICS K.K.
-HPQ	HP
-HPR	H.P.R. Electronics GmbH
-HRC	Hercules
-HRE	Qingdao Haier Electronics Co., Ltd.
-HRL	Herolab GmbH
-HRS	Harris Semiconductor
-HRT	HERCULES
-HSC	Hagiwara Sys-Com Company Ltd
-HSM	AT&T Microelectronics
-HTC	Hitachi Ltd
-HTI	Hampshire Company, Inc.
-HTK	Holtek Microelectronics Inc
-HTX	Hitex Systementwicklung GmbH
-HUB	GAI-Tronics, A Hubbell Company
-HUM	IMP Electronics Ltd.
-HWA	Harris Canada Inc
-HWC	DBA Hans Wedemeyer
-HWD	Highwater Designs Ltd
-HWP	Hewlett Packard
-HXM	Hexium Ltd.
-HYC	Hypercope Gmbh Aachen
-HYO	HYC CO., LTD.
-HYP	Hyphen Ltd
-HYR	Hypertec Pty Ltd
-HYT	Heng Yu Technology (HK) Limited
-HYV	Hynix Semiconductor
-IAF	Institut f r angewandte Funksystemtechnik GmbH
-IAI	Integration Associates, Inc.
-IAT	IAT Germany GmbH
-IBC	Integrated Business Systems
-IBI	INBINE.CO.LTD
-IBM	IBM Brasil
-IBM	IBM France
-IBP	IBP Instruments GmbH
-IBR	IBR GmbH
-ICA	ICA Inc
-ICC	BICC Data Networks Ltd
-ICD	ICD Inc
-ICE	IC Ensemble
-ICI	Infotek Communication Inc
-ICM	Intracom SA
-ICN	Sanyo Icon
-ICO	Intel Corp
-ICS	Integrated Circuit Systems
-ICX	ICCC A/S
-IDC	International Datacasting Corporation
-IDE	IDE Associates
-IDK	IDK Corporation
-IDO	IDEO Product Development
-IDS	Interdigital Sistemas de Informacao
-IDT	International Display Technology
-IDX	IDEXX Labs
-IEC	Interlace Engineering Corporation
-IEE	IEE
-IEI	Interlink Electronics
-IFS	In Focus Systems Inc
-IFT	Informtech
-IFX	Infineon Technologies AG
-IGC	Intergate Pty Ltd
-IGM	IGM Communi
-IIC	ISIC Innoscan Industrial Computers A/S
-III	Intelligent Instrumentation
-IIN	IINFRA Co., Ltd
-IKS	Ikos Systems Inc
-ILC	Image Logic Corporation
-ILS	Innotech Corporation
-IMA	Imagraph
-IMC	IMC Networks
-IMD	ImasDe Canarias S.A.
-IME	Imagraph
-IMG	IMAGENICS Co., Ltd.
-IMI	International Microsystems Inc
-IMM	Immersion Corporation
-IMN	Impossible Production
-IMP	Impression Products Incorporated
-IMT	Inmax Technology Corporation
-INC	Home Row Inc
-IND	ILC
-INE	Inventec Electronics (M) Sdn. Bhd.
-INF	Inframetrics Inc
-ING	Integraph Corporation
-INI	Initio Corporation
-INK	Indtek Co., Ltd.
-INL	InnoLux Display Corporation
-INM	InnoMedia Inc
-INN	Innovent Systems, Inc.
-INO	Innolab Pte Ltd
-INP	Interphase Corporation
-INS	Ines GmbH
-INT	Interphase Corporation
-inu	Inovatec S.p.A.
-INV	Inviso, Inc.
-INZ	Best Buy
-IOA	CRE Technology Corporation
-IOD	I-O Data Device Inc
-IOM	Iomega
-ION	Inside Out Networks
-IOS	i-O Display System
-IOT	I/OTech Inc
-IPC	IPC Corporation
-IPD	Industrial Products Design, Inc.
-IPI	Intelligent Platform Management Interface (IPMI) forum (Intel, HP, NEC, Dell)
-IPM	IPM Industria Politecnica Meridionale SpA
-IPN	Performance Technologies
-IPR	Ithaca Peripherals
-IPS	IPS, Inc. (Intellectual Property Solutions, Inc.)
-IPT	International Power Technologies
-IPW	IPWireless, Inc
-IQT	IMAGEQUEST Co., Ltd
-IRD	IRdata
-ISA	Symbol Technologies
-ISC	Id3 Semiconductors
-ISG	Insignia Solutions Inc
-ISI	Interface Solutions
-ISL	Isolation Systems
-ISP	IntreSource Systems Pte Ltd
-ISR	INSIS Co., LTD.
-ISS	ISS Inc
-IST	Intersolve Technologies
-ISY	International Integrated Systems,Inc.(IISI)
-ITA	Itausa Export North America
-ITC	Intercom Inc
-ITD	Internet Technology Corporation
-ITE	Integrated Tech Express Inc
-ITK	ITK Telekommunikation AG
-ITL	Inter-Tel
-ITM	ITM inc.
-ITN	The NTI Group
-ITP	IT-PRO Consulting und Systemhaus GmbH
-ITR	Infotronic America, Inc.
-ITS	IDTECH
-ITT	I&T Telecom.
-ITX	integrated Technology Express Inc
-IUC	ICSL
-IVI	Intervoice Inc
-IVM	Liyama North America
-IWR	Icuiti Corporation
-IWX	Intelliworxx, Inc.
-IXD	Intertex Data AB
-JAC	Astec Inc
-JAE	Japan Aviation Electronics Industry, Limited
-JAT	Jaton Corporation
-JAZ	Carrera Computer Inc (used as second pnpid)
-JCE	Jace Tech Inc
-JDL	Japan Digital Laboratory Co.,Ltd.
-JEN	N-Vision
-JET	JET POWER TECHNOLOGY CO., LTD.
-JFX	Jones Futurex Inc
-JGD	University College
-JIC	Jaeik Information & Communication Co., Ltd.
-JMT	Micro Technical Company Ltd
-JPC	JPC Technology Limited
-JPW	Wallis Hamilton Industries
-JQE	CNet Technical Inc
-JSD	JS DigiTech, Inc
-JSI	Jupiter Systems, Inc.
-JSK	SANKEN ELECTRIC CO., LTD
-JTS	JS Motorsports
-JUK	Janich & Klass Computertechnik GmbH
-JUP	Jupiter Systems
-JVC	JVC
-JWD	Video International Inc.
-JWL	Jewell Instruments, LLC
-JWS	JWSpencer & Co.
-JWY	Jetway Information Co., Ltd
-KAR	Karna
-KBI	Kidboard Inc
-KBL	Kobil Systems GmbH
-KCL	Keycorp Ltd
-KDE	KDE
-KDK	Kodiak Tech
-KDM	Korea Data Systems Co., Ltd.
-KDS	KDS USA
-KEC	Kyushu Electronics Systems Inc
-KEM	Kontron Embedded Modules GmbH
-KES	Kesa Corporation
-KEY	Key Tech Inc
-KFC	SCD Tech
-KFX	Kofax Image Products
-KIS	KiSS Technology A/S
-KMC	Mitsumi Company Ltd
-KML	Kensington Microware Ltd
-KNC	Konica corporation
-KNX	Nutech Marketing PTL
-KOB	Kobil Systems GmbH
-KOD	Eastman Kodak Company
-KOE	KOLTER ELECTRONIC
-KOL	Kollmorgen Motion Technologies Group
-KOW	KOWA Company,LTD.
-KPC	King Phoenix Company
-KRL	Krell Industries Inc.
-KRY	Kroy LLC
-KSC	Kinetic Systems Corporation
-KSL	Karn Solutions Ltd.
-KSX	King Tester Corporation
-KTC	Kingston Tech Corporation
-KTE	K-Tech
-KTG	Kayser-Threde GmbH
-KTI	Konica Technical Inc
-KTK	Key Tronic Corporation
-KTN	Katron Tech Inc
-KUR	Kurta Corporation
-KVA	Kvaser AB
-KWD	Kenwood Corporation
-KYC	Kyocera Corporation
-KYE	KYE Syst Corporation
-KYK	Samsung Electronics America Inc
-KZI	K-Zone International co. Ltd.
-KZN	K-Zone International
-LAB	ACT Labs Ltd
-LAC	LaCie
-LAF	Microline
-LAG	Laguna Systems
-LAN	Sodeman Lancom Inc
-LAS	LASAT Comm. A/S
-LAV	Lava Computer MFG Inc
-LBO	Lubosoft
-LCC	LCI
-LCD	Toshiba Matsushita Display Technology Co., Ltd
-LCE	La Commande Electronique
-LCI	Lite-On Communication Inc
-LCM	Latitude Comm.
-LCN	LEXICON
-LCS	Longshine Electronics Company
-LCT	Labcal Technologies
-LDT	LogiDataTech Electronic GmbH
-LEC	Lectron Company Ltd
-LED	Long Engineering Design Inc
-LEG	Legerity, Inc
-LEN	Lenovo Group Limited
-LEO	First International Computer Inc
-LEX	Lexical Ltd
-LGC	Logic Ltd
-LGI	Logitech Inc
-LGS	LG Semicom Company Ltd
-LGX	Lasergraphics, Inc.
-LHA	Lars Haagh ApS
-LHE	Lung Hwa Electronics Company Ltd
-LIT	Lithics Silicon Technology
-LJX	Datalogic Corporation
-LKM	Likom Technology Sdn. Bhd.
-LMG	Lucent Technologies
-LMI	Lexmark Int'l Inc
-LMP	Leda Media Products
-LMT	Laser Master
-LND	Land Computer Company Ltd
-LNK	Link Tech Inc
-LNR	Linear Systems Ltd.
-LNT	LANETCO International
-LNV	Lenovo
-LOC	Locamation B.V.
-LOE	Loewe Opta GmbH
-LOG	Logicode Technology Inc
-LPE	El-PUSK Co., Ltd.
-LPI	Design Technology
-LPL	LG Philips
-LSC	LifeSize Communications
-LSI	Loughborough Sound Images
-LSJ	LSI Japan Company Ltd
-LSL	Logical Solutions
-LSY	LSI Systems Inc
-LTC	Labtec Inc
-LTI	Jongshine Tech Inc
-LTK	Lucidity Technology Company Ltd
-LTN	Litronic Inc
-LTS	LTS Scale LLC
-LTV	Leitch Technology International Inc.
-LTW	Lightware, Inc
-LUC	Lucent Technologies
-LUM	Lumagen, Inc.
-LUX	Luxxell Research Inc
-LWC	Labway Corporation
-LWR	Lightware Visual Engineering
-LWW	Lanier Worldwide
-LXN	Luxeon
-LXS	ELEA CardWare
-LZX	Lightwell Company Ltd
-MAC	MAC System Company Ltd
-MAD	Xedia Corporation
-MAE	Maestro Pty Ltd
-MAG	MAG InnoVision
-MAI	Mutoh America Inc
-MAL	Meridian Audio Ltd
-MAN	LGIC
-MAS	Mass Inc.
-MAT	Matsushita Electric Ind. Company Ltd
-MAX	Rogen Tech Distribution Inc
-MAY	Maynard Electronics
-MAZ	MAZeT GmbH
-MBC	MBC
-MBD	Microbus PLC
-MBM	Marshall Electronics
-MBV	Moreton Bay
-MCA	American Nuclear Systems Inc
-MCC	Micro Industries
-MCD	McDATA Corporation
-MCE	Metz-Werke GmbH & Co KG
-MCG	Motorola Computer Group
-MCI	Micronics Computers
-MCL	Motorola Communications Israel
-MCM	Metricom Inc
-MCN	Micron Electronics Inc
-MCO	Motion Computing Inc.
-MCP	Magni Systems Inc
-MCQ	Mat's Computers
-MCR	Marina Communicaitons
-MCS	Micro Computer Systems
-MCT	Microtec
-MDA	Media4 Inc
-MDC	Midori Electronics
-MDD	MODIS
-MDG	Madge Networks
-MDI	Micro Design Inc
-MDK	Mediatek Corporation
-MDO	Panasonic
-MDR	Medar Inc
-MDS	Micro Display Systems Inc
-MDT	Magus Data Tech
-MDV	MET Development Inc
-MDX	MicroDatec GmbH
-MDY	Microdyne Inc
-MEC	Mega System Technologies Inc
-MED	Messeltronik Dresden GmbH
-MEE	Mitsubishi Electric Engineering Co., Ltd.
-MEG	Abeam Tech Ltd
-MEI	Panasonic Industry Company
-MEL	Mitsubishi Electric Corporation
-MEN	MEN Mikroelectronik Nueruberg GmbH
-MEQ	Matelect Ltd.
-MET	Metheus Corporation
-MFG	MicroField Graphics Inc
-MFI	Micro Firmware
-MFR	MediaFire Corp.
-MGA	Mega System Technologies, Inc.
-MGE	Schneider Electric S.A.
-MGL	M-G Technology Ltd
-MGT	Megatech R & D Company
-MIC	Micom Communications Inc
-MID	miro Displays
-MII	Mitec Inc
-MIL	Marconi Instruments Ltd
-MIP	micronpc.com
-MIR	Miro Computer Prod.
-MIS	Modular Industrial Solutions Inc
-MIT	MCM Industrial Technology GmbH
-MJI	MARANTZ JAPAN, INC.
-MJS	MJS Designs
-MKC	Media Tek Inc.
-MKT	MICROTEK Inc.
-MKV	Trtheim Technology
-MLD	Deep Video Imaging Ltd
-MLG	Micrologica AG
-MLI	McIntosh Laboratory Inc.
-MLM	Millennium Engineering Inc
-MLN	Mark Levinson
-MLS	Milestone EPE
-MLX	Mylex Corporation
-MMA	Micromedia AG
-MMD	Micromed Biotecnologia Ltd
-MMF	Minnesota Mining and Manufacturing
-MMI	Multimax
-MMM	Electronic Measurements
-MMN	MiniMan Inc
-MMS	MMS Electronics
-MNC	Mini Micro Methods Ltd
-MNL	Monorail Inc
-MNP	Microcom
-MOD	Modular Technology
-MOM	Momentum Data Systems
-MOS	Moses Corporation
-MOT	Motorola UDS
-MPC	M-Pact Inc
-MPI	Mediatrix Peripherals Inc
-MPJ	Microlab
-MPL	Maple Research Inst. Company Ltd
-MPN	Mainpine Limited
-MPS	mps Software GmbH
-MPX	Micropix Technologies, Ltd.
-MQP	MultiQ Products AB
-MRA	Miranda Technologies Inc
-MRC	Marconi Simulation & Ty-Coch Way Training
-MRD	MicroDisplay Corporation
-MRK	Maruko & Company Ltd
-MRL	Miratel
-MRO	Medikro Oy
-MRT	Merging Technologies
-MSA	Micro Systemation AB
-MSC	Mouse Systems Corporation
-MSD	Datenerfassungs- und Informationssysteme
-MSF	M-Systems Flash Disk Pioneers
-MSG	MSI GmbH
-MSH	Microsoft
-MSI	Microstep
-MSK	Megasoft Inc
-MSL	MicroSlate Inc.
-MSM	Advanced Digital Systems
-MSP	Mistral Solutions [P] Ltd.
-MST	MS Telematica
-MSU	motorola
-MSV	Mosgi Corporation
-MSX	Micomsoft Co., Ltd.
-MSY	MicroTouch Systems Inc
-MTB	Media Technologies Ltd.
-MTC	Mars-Tech Corporation
-MTD	MindTech Display Co. Ltd
-MTE	MediaTec GmbH
-MTH	Micro-Tech Hearing Instruments
-MTI	MaxCom Technical Inc
-MTI	Motorola Inc.
-MTK	Microtek International Inc.
-MTL	Mitel Corporation
-MTN	Mtron Storage Technology Co., Ltd.
-MTR	Mitron computer Inc
-MTS	Multi-Tech Systems
-MTU	Mark of the Unicorn Inc
-MTX	Matrox
-MUD	Multi-Dimension Institute
-MUK	mainpine limited
-MVD	Microvitec PLC
-MVI	Media Vision Inc
-MVM	SOBO VISION
-MVS	Microvision
-MVX	COM 1
-MWI	Multiwave Innovation Pte Ltd
-MWR	mware
-MWY	Microway Inc
-MXD	MaxData Computer GmbH & Co.KG
-MXI	Macronix Inc
-MXL	Hitachi Maxell, Ltd.
-MXP	Maxpeed Corporation
-MXT	Maxtech Corporation
-MXV	MaxVision Corporation
-MYA	Monydata
-MYR	Myriad Solutions Ltd
-MYX	Micronyx Inc
-NAC	Ncast Corporation
-NAD	NAD Electronics
-NAL	Network Alchemy
-NAV	Navigation Corporation
-NAX	Naxos Tecnologia
-NBL	N*Able Technologies Inc
-NBS	National Key Lab. on ISN
-NBT	NingBo Bestwinning Technology CO., Ltd
-NCA	Nixdorf Company
-NCC	NCR Corporation
-NCE	Norcent Technology, Inc.
-NCI	NewCom Inc
-NCL	NetComm Ltd
-NCR	NCR Electronics
-NCS	Northgate Computer Systems
-NCT	NEC CustomTechnica, Ltd.
-NDC	National DataComm Corporaiton
-NDI	National Display Systems
-NDK	Naitoh Densei CO., LTD.
-NDL	Network Designers
-NDS	Nokia Data
-NEC	NEC Corporation
-NEO	NEO TELECOM CO.,LTD.
-NET	Mettler Toledo
-NEU	NEUROTEC - EMPRESA DE PESQUISA E DESENVOLVIMENTO EM BIOMEDICINA
-NEX	Nexgen Mediatech Inc.,
-NFC	BTC Korea Co., Ltd
-NFS	Number Five Software
-NGC	Network General
-NGS	A D S Exports
-NHT	Vinci Labs
-NIC	National Instruments Corporation
-NIS	Nissei Electric Company
-NIT	Network Info Technology
-NIX	Seanix Technology Inc
-NLC	Next Level Communications
-NMP	Nokia Mobile Phones
-NMS	Natural Micro System
-NMV	NEC-Mitsubishi Electric Visual Systems Corporation
-NMX	Neomagic
-NNC	NNC
-NOK	Nokia Display Products
-NOR	Norand Corporation
-NOT	Not Limited Inc
-NPI	Network Peripherals Inc
-NRL	U.S. Naval Research Lab
-NRT	Beijing Northern Radiantelecom Co.
-NRV	Taugagreining hf
-NSC	National Semiconductor Corporation
-NSI	NISSEI ELECTRIC CO.,LTD
-NSP	Nspire System Inc.
-NSS	Newport Systems Solutions
-NST	Network Security Technology Co
-NTC	NeoTech S.R.L
-NTI	New Tech Int'l Company
-NTL	National Transcomm. Ltd
-NTN	Nuvoton Technology Corporation
-NTR	N-trig Innovative Technologies, Inc.
-NTS	Nits Technology Inc.
-NTT	NTT Advanced Technology Corporation
-NTW	Networth Inc
-NTX	Netaccess Inc
-NUG	NU Technology, Inc.
-NUI	NU Inc.
-NVC	NetVision Corporation
-NVD	Nvidia
-NVI	NuVision US, Inc.
-NVL	Novell Inc
-NVT	Navatek Engineering Corporation
-NWC	NW Computer Engineering
-NWP	NovaWeb Technologies Inc
-NWS	Newisys, Inc.
-NXC	NextCom K.K.
-NXG	Nexgen
-NXP	NXP Semiconductors bv.
-NXQ	Nexiq Technologies, Inc.
-NXS	Technology Nexus Secure Open Systems AB
-NYC	nakayo telecommunications,inc.
-OAK	Oak Tech Inc
-OAS	Oasys Technology Company
-OCD	Macraigor Systems Inc
-OCN	Olfan
-OCS	Open Connect Solutions
-ODM	ODME Inc.
-ODR	Odrac
-OEC	ORION ELECTRIC CO.,LTD
-OIC	Option Industrial Computers
-OIM	Option International
-OIN	Option International
-OKI	OKI Electric Industrial Company Ltd
-OLC	Olicom A/S
-OLD	Olidata S.p.A.
-OLI	Olivetti
-OLT	Olitec S.A.
-OLV	Olitec S.A.
-OLY	OLYMPUS CORPORATION
-OMC	OBJIX Multimedia Corporation
-OMN	Omnitel
-OMR	Omron Corporation
-ONE	Oneac Corporation
-ONK	ONKYO Corporation
-ONS	On Systems Inc
-ONW	OPEN Networks Ltd
-ONX	SOMELEC Z.I. Du Vert Galanta
-OOS	OSRAM
-OPC	Opcode Inc
-OPI	D.N.S. Corporation
-OPT	OPTi Inc
-OPV	Optivision Inc
-OQI	Oksori Company Ltd
-ORG	ORGA Kartensysteme GmbH
-ORI	OSR Open Systems Resources, Inc.
-ORN	ORION ELECTRIC CO., LTD.
-OSA	OSAKA Micro Computer, Inc.
-OSP	OPTI-UPS Corporation
-OSR	Oksori Company Ltd
-OTI	Orchid Technology
-OTT	OPTO22, Inc.
-OUK	OUK Company Ltd
-OWL	Mediacom Technologies Pte Ltd
-OXU	Oxus Research S.A.
-OYO	Shadow Systems
-OZO	Tribe Computer Works Inc
-PAC	Pacific Avionics Corporation
-PAD	Promotion and Display Technology Ltd.
-PAK	Many CNC System Co., Ltd.
-PAM	Peter Antesberger Messtechnik
-PAN	The Panda Project
-PAR	Parallan Comp Inc
-PBI	Pitney Bowes
-PBL	Packard Bell Electronics
-PBN	Packard Bell NEC
-PBV	Pitney Bowes
-PCA	Philips BU Add On Card
-PCB	OCTAL S.A.
-PCC	PowerCom Technology Company Ltd
-PCG	First Industrial Computer Inc
-PCI	Pioneer Computer Inc
-PCK	PCBANK21
-PCL	pentel.co.,ltd
-PCM	PCM Systems Corporation
-PCO	Performance Concepts Inc.,
-PCP	Procomp USA Inc
-PCT	PC-Tel Inc
-PCW	Pacific CommWare Inc
-PCX	PC Xperten
-PDM	Psion Dacom Plc.
-PDN	AT&T Paradyne
-PDR	Pure Data Inc
-PDS	PD Systems International Ltd
-PDT	PDTS - Prozessdatentechnik und Systeme
-PDV	Prodrive B.V.
-PEC	POTRANS Electrical Corp.
-PEI	PEI Electronics Inc
-PEL	Primax Electric Ltd
-PEN	Interactive Computer Products Inc
-PEP	Peppercon AG
-PER	Perceptive Signal Technologies
-PET	Practical Electronic Tools
-PFT	Telia ProSoft AB
-PGM	Paradigm Advanced Research Centre
-PGP	propagamma kommunikation
-PGS	Princeton Graphic Systems
-PHC	Pijnenburg Beheer N.V.
-PHI	DO NOT USE - PHI
-PHL	Philips Consumer Electronics Company
-PHO	Photonics Systems Inc.
-PHS	Philips Communication Systems
-PHY	Phylon Communications
-PIE	Pacific Image Electronics Company Ltd
-PIM	Prism, LLC
-PIO	Pioneer Electronic Corporation
-PIX	Pixie Tech Inc
-PJA	Projecta
-PJD	Projectiondesign AS
-PJT	Pan Jit International Inc.
-PKA	Acco UK ltd.
-PLC	Pro-Log Corporation
-PLM	PROLINK Microsystems Corp.
-PLV	PLUS Vision Corp.
-PLX	Parallax Graphics
-PLY	Polycom Inc.
-PMC	PMC Consumer Electronics Ltd
-PMD	TDK USA Corporation
-PMM	Point Multimedia System
-PMT	Promate Electronic Co., Ltd.
-PMX	Photomatrix
-PNG	Microsoft
-PNG	P.I. Engineering Inc
-PNL	Panelview, Inc.
-PNP	Microsoft
-PNR	Planar Systems, Inc.
-PNS	PanaScope
-PNX	Phoenix Technologies, Ltd.
-POL	PolyComp (PTY) Ltd.
-PON	Perpetual Technologies, LLC
-POR	Portalis LC
-PPC	Phoenixtec Power Company Ltd
-PPD	MEPhI
-PPI	Practical Peripherals
-PPM	Clinton Electronics Corp.
-PPP	Purup Prepress AS
-PPR	PicPro
-PRA	PRO/AUTOMATION
-PRC	PerComm
-PRD	Praim S.R.L.
-PRF	Digital Electronics Corporation
-PRG	The Phoenix Research Group Inc
-PRI	Priva Hortimation BV
-PRM	Prometheus
-PRO	Proteon
-PRS	Leutron Vision
-PRX	Proxima Corporation
-PSA	Advanced Signal Processing Technologies
-PSC	Philips Semiconductors
-PSD	Peus-Systems GmbH
-PSE	Practical Solutions Pte., Ltd.
-PSI	PSI-Perceptive Solutions Inc
-PSL	Perle Systems Limited
-PSM	Prosum
-PST	Global Data SA
-PTC	PS Technology Corporation
-PTG	Cipher Systems Inc
-PTH	Pathlight Technology Inc
-PTI	Promise Technology Inc
-PTL	Pantel Inc
-PTS	Plain Tree Systems Inc
-PVG	Proview Global Co., Ltd
-PVN	Pixel Vision
-PVP	Klos Technologies, Inc.
-PXC	Phoenix Contact
-PXE	PIXELA CORPORATION
-PXL	The Moving Pixel Company
-PXM	Proxim Inc
-QCC	QuakeCom Company Ltd
-QCH	Metronics Inc
-QCI	Quanta Computer Inc
-QCK	Quick Corporation
-QCL	Quadrant Components Inc
-QCP	Qualcomm Inc
-QDI	Quantum Data Incorporated
-QDM	Quadram
-QDS	Quanta Display Inc.
-QFF	Padix Co., Inc.
-QFI	Quickflex, Inc
-QLC	Q-Logic
-QQQ	Chuomusen Co., Ltd.
-QSI	Quantum Solutions, Inc.
-QTD	Quantum 3D Inc
-QTH	Questech Ltd
-QTI	Quicknet Technologies Inc
-QTM	Quantum
-QTR	Qtronix Corporation
-QUA	Quatographic AG
-QUE	Questra Consulting
-RAC	Racore Computer Products Inc
-RAD	Radisys Corporation
-RAI	Rockwell Automation/Intecolor
-RAN	Rancho Tech Inc
-RAR	Raritan, Inc.
-RAS	RAScom Inc
-RAT	Rent-A-Tech
-RAY	Raylar Design, Inc.
-RCE	Parc d'Activite des Bellevues
-RCH	Reach Technology Inc
-RCI	RC International
-RCN	Radio Consult SRL
-RDI	Rainbow Displays, Inc.
-RDM	Tremon Enterprises Company Ltd
-RDS	Radius Inc
-REA	Real D
-REC	ReCom
-RED	Research Electronics Development Inc
-REF	Reflectivity, Inc.
-REL	Reliance Electric Ind Corporation
-REM	SCI Systems Inc.
-REN	Renesas Technology Corp.
-RES	ResMed Pty Ltd
-RGL	Robertson Geologging Ltd
-RHM	Rohm Company Ltd
-RII	Racal Interlan Inc
-RIO	Rios Systems Company Ltd
-RIT	Ritech Inc
-RIV	Rivulet Communications
-RJA	Roland Corporation
-RJS	Advanced Engineering
-RKC	Reakin Technolohy Corporation
-RLD	MEPCO
-RLN	RadioLAN Inc
-RMC	Raritan Computer, Inc
-RMP	Research Machines
-RNB	Rainbow Technologies
-ROB	Robust Electronics GmbH
-ROH	Rohm Co., Ltd.
-ROK	Rockwell International
-ROP	Roper International Ltd
-RPT	R.P.T.Intergroups
-RRI	Radicom Research Inc
-RSC	PhotoTelesis
-RSH	ADC-Centre
-RSI	Rampage Systems Inc
-RSN	Radiospire Networks, Inc.
-RSQ	R Squared
-RSS	Rockwell Semiconductor Systems
-RSX	Rapid Tech Corporation
-RTC	Relia Technologies
-RTI	Rancho Tech Inc
-RTL	Realtek Semiconductor Company Ltd
-RTS	Raintree Systems
-RUN	RUNCO International
-RUP	Ups Manufactoring s.r.l.
-RVC	RSI Systems Inc
-RVI	Realvision Inc
-RVL	Reveal Computer Prod
-RWC	Red Wing Corporation
-RXT	Tectona SoftSolutions (P) Ltd.,
-SAA	Sanritz Automation Co.,Ltd.
-SAE	Saab Aerotech
-SAG	Sedlbauer
-SAI	Sage Inc
-SAK	Saitek Ltd
-SAM	Samsung Electric Company
-SAN	Sanyo Electric Co.,Ltd.
-SAS	Stores Automated Systems Inc
-SAT	Shuttle Tech
-SBC	Shanghai Bell Telephone Equip Mfg Co
-SBD	Softbed - Consulting & Development Ltd
-SBI	SMART Technologies Inc.
-SBS	SBS-or Industrial Computers GmbH
-SBT	Senseboard Technologies AB
-SCC	SORD Computer Corporation
-SCD	Sanyo Electric Company Ltd
-SCE	Sun Corporation
-SCH	Schlumberger Cards
-SCI	System Craft
-SCL	Sigmacom Co., Ltd.
-SCM	SCM Microsystems Inc
-SCN	Scanport, Inc.
-SCO	SORCUS Computer GmbH
-SCP	Scriptel Corporation
-SCR	Systran Corporation
-SCS	Nanomach Anstalt
-SCT	Smart Card Technology
-SDA	SAT (Societe Anonyme)
-SDD	Intrada-SDD Ltd
-SDE	Sherwood Digital Electronics Corporation
-SDF	SODIFF E&T CO., Ltd.
-SDH	Communications Specialies, Inc.
-SDI	Samtron Displays Inc
-SDK	SAIT-Devlonics
-SDR	SDR Systems
-SDS	SunRiver Data System
-SDT	Siemens AG
-SDX	SDX Business Systems Ltd
-SEA	Seanix Technology Inc.
-SEB	system elektronik GmbH
-SEC	Seiko Epson Corporation
-SEE	SeeColor Corporation
-SEI	Seitz & Associates Inc
-SEL	Way2Call Communications
-SEM	Samsung Electronics Company Ltd
-SEN	Sencore
-SEO	SEOS Ltd
-SEP	SEP Eletronica Ltda.
-SER	Sony Ericsson Mobile Communications Inc.
-SET	SendTek Corporation
-SFM	TORNADO Company
-SFT	Mikroforum Ring 3
-SGC	Spectragraphics Corporation
-SGD	Sigma Designs, Inc.
-SGE	Kansai Electric Company Ltd
-SGI	Scan Group Ltd
-SGL	Super Gate Technology Company Ltd
-SGM	SAGEM
-SGO	Logos Design A/S
-SGT	Stargate Technology
-SGX	Silicon Graphics Inc
-SGZ	Systec Computer GmbH
-SHC	ShibaSoku Co., Ltd.
-SHG	Soft & Hardware development Goldammer GmbH
-SHI	Jiangsu Shinco Electronic Group Co., Ltd
-SHP	Sharp Corporation
-SHR	Digital Discovery
-SHT	Shin Ho Tech
-SIA	SIEMENS AG
-SIB	Sanyo Electric Company Ltd
-SIC	Sysmate Corporation
-SID	Seiko Instruments Information Devices Inc
-SIE	Siemens
-SIG	Sigma Designs Inc
-SII	Silicon Image, Inc.
-SIL	Silicon Laboratories, Inc
-SIM	S3 Inc
-SIN	Singular Technology Co., Ltd.
-SIR	Sirius Technologies Pty Ltd
-SIS	Silicon Integrated Systems Corporation
-SIT	Sitintel
-SIU	Seiko Instruments USA Inc
-SIX	Zuniq Data Corporation
-SJE	Sejin Electron Inc
-SKD	Schneider & Koch
-SKT	Samsung Electro-Mechanics Company Ltd
-SKY	SKYDATA S.P.A.
-SLA	Systeme Lauer GmbH&Co KG
-SLB	Shlumberger Ltd
-SLC	Syslogic Datentechnik AG
-SLH	Silicon Library Inc.
-SLI	Symbios Logic Inc
-SLK	Silitek Corporation
-SLM	Solomon Technology Corporation
-SLR	Schlumberger Technology Corporate
-SLT	Salt Internatioinal Corp.
-SLX	Specialix
-SMA	SMART Modular Technologies
-SMB	Schlumberger
-SMC	Standard Microsystems Corporation
-SME	Sysmate Company
-SMI	SpaceLabs Medical Inc
-SMK	SMK CORPORATION
-SML	Sumitomo Metal Industries, Ltd.
-SMM	Shark Multimedia Inc
-SMO	STMicroelectronics
-SMP	Simple Computing
-SMR	B.& V. s.r.l.
-SMS	Silicom Multimedia Systems Inc
-SMT	Silcom Manufacturing Tech Inc
-SNC	Sentronic International Corp.
-SNI	Siemens Microdesign GmbH
-SNK	S&K Electronics
-SNO	SINOSUN TECHNOLOGY CO., LTD
-SNP	Siemens Nixdorf Info Systems
-SNS	Cirtech (UK) Ltd
-SNT	SuperNet Inc
-SNW	Snell & Wilcox
-SNX	Sonix Comm. Ltd
-SNY	Sony
-SOI	Silicon Optix Corporation
-SOL	Solitron Technologies Inc
-SON	Sony
-SOR	Sorcus Computer GmbH
-SOT	Sotec Company Ltd
-SOY	SOYO Group, Inc
-SPC	SpinCore Technologies, Inc
-SPE	SPEA Software AG
-SPH	G&W Instruments GmbH
-SPI	SPACE-I Co., Ltd.
-SPL	Smart Silicon Systems Pty Ltd
-SPN	Sapience Corporation
-SPR	pmns GmbH
-SPS	Synopsys Inc
-SPT	Sceptre Tech Inc
-SPU	SIM2 Multimedia S.P.A.
-SPX	Simplex Time Recorder Co.
-SQT	Sequent Computer Systems Inc
-SRC	Integrated Tech Express Inc
-SRD	Setred
-SRF	Surf Communication Solutions Ltd
-SRG	Intuitive Surgical, Inc.
-SRT	SeeReal Technologies GmbH
-SSC	Sierra Semiconductor Inc
-SSD	FlightSafety International
-SSE	Samsung Electronic Co.
-SSI	S-S Technology Inc
-SSJ	Sankyo Seiki Mfg.co., Ltd
-SSP	Spectrum Signal Proecessing Inc
-SSS	S3 Inc
-SST	SystemSoft Corporation
-STA	ST Electronics Systems Assembly Pte Ltd
-STB	STB Systems Inc
-STC	STAC Electronics
-STD	STD Computer Inc
-STE	SII Ido-Tsushin Inc
-STF	Starflight Electronics
-STG	StereoGraphics Corp.
-STH	Semtech Corporation
-STI	Smart Tech Inc
-STK	SANTAK CORP.
-STL	SigmaTel Inc
-STM	SGS Thomson Microelectronics
-STN	Samsung Electronics America
-STO	Stollmann E+V GmbH
-STP	StreamPlay Ltd
-STR	Starlight Networks Inc
-STS	SITECSYSTEM CO., LTD.
-STT	Star Paging Telecom Tech (Shenzhen) Co. Ltd.
-STW	Starwin Inc.
-STY	SDS Technologies
-SUB	Subspace Comm. Inc
-SUM	Summagraphics Corporation
-SUN	Sun Electronics Corporation
-SUP	Supra Corporation
-SUR	Surenam Computer Corporation
-SVA	SGEG
-SVC	Intellix Corp.
-SVD	SVD Computer
-SVI	Sun Microsystems
-SVS	SVSI
-SVT	SEVIT Co., Ltd.
-SWC	Software Café
-SWI	Sierra Wireless Inc.
-SWL	Sharedware Ltd
-SWS	Static
-SWT	Software Technologies Group,Inc.
-SXB	Syntax-Brillian
-SXD	Silex technology, Inc.
-SXL	SolutionInside
-SYC	Sysmic
-SYK	Stryker Communications
-SYL	Sylvania Computer Products
-SYM	Symicron Computer Communications Ltd.
-SYN	Synaptics Inc
-SYP	SYPRO Co Ltd
-SYS	Sysgration Ltd
-SYT	Seyeon Tech Company Ltd
-SYV	SYVAX Inc
-SYX	Prime Systems, Inc.
-TAA	Tandberg
-TAB	Todos Data System AB
-TAG	Teles AG
-TAI	Toshiba America Info Systems Inc
-TAM	Tamura Seisakusyo Ltd
-TAS	Taskit Rechnertechnik GmbH
-TAT	Teleliaison Inc
-TAX	Taxan (Europe) Ltd
-TBB	Triple S Engineering Inc
-TBC	Turbo Communication, Inc
-TBS	Turtle Beach System
-TCC	Tandon Corporation
-TCD	Taicom Data Systems Co., Ltd.
-TCE	Century Corporation
-TCH	Interaction Systems, Inc
-TCI	Tulip Computers Int'l B.V.
-TCJ	TEAC America Inc
-TCL	Technical Concepts Ltd
-TCM	3Com Corporation
-TCN	Tecnetics (PTY) Ltd
-TCO	Thomas-Conrad Corporation
-TCR	Thomson Consumer Electronics
-TCS	Tatung Company of America Inc
-TCT	Telecom Technology Centre Co. Ltd.
-TCX	FREEMARS Heavy Industries
-TDC	Teradici
-TDD	Tandberg Data Display AS
-TDK	TDK USA Corporation
-TDM	Tandem Computer Europe Inc
-TDP	3D Perception
-TDS	Tri-Data Systems Inc
-TDT	TDT
-TDV	TDVision Systems, Inc.
-TDY	Tandy Electronics
-TEA	TEAC System Corporation
-TEC	Tecmar Inc
-TEK	Tektronix Inc
-TEL	Promotion and Display Technology Ltd.
-TER	TerraTec Electronic GmbH
-TGI	TriGem Computer Inc
-TGM	TriGem Computer,Inc.
-TGS	Torus Systems Ltd
-TGV	Grass Valley Germany GmbH
-THN	Thundercom Holdings Sdn. Bhd.
-TIC	Trigem KinfoComm
-TIP	TIPTEL AG
-TIV	OOO Technoinvest
-TIX	Tixi.Com GmbH
-TKC	Taiko Electric Works.LTD
-TKN	Teknor Microsystem Inc
-TKO	TouchKo, Inc.
-TKS	TimeKeeping Systems, Inc.
-TLA	Ferrari Electronic GmbH
-TLD	Telindus
-TLI	TOSHIBA TELI CORPORATION
-TLK	Telelink AG
-TLS	Teleste Educational OY
-TLT	Dai Telecom S.p.A.
-TLV	S3 Inc
-TLX	Telxon Corporation
-TMC	Techmedia Computer Systems Corporation
-TME	AT&T Microelectronics
-TMI	Texas Microsystem
-TMM	Time Management, Inc.
-TMR	Taicom International Inc
-TMS	Trident Microsystems Ltd
-TMT	T-Metrics Inc.
-TMX	Thermotrex Corporation
-TNC	TNC Industrial Company Ltd
-TNM	TECNIMAGEN SA
-TNY	Tennyson Tech Pty Ltd
-TOE	TOEI Electronics Co., Ltd.
-TOG	The OPEN Group
-TOP	Orion Communications Co., Ltd.
-TOS	Toshiba Corporation
-TOU	Touchstone Technology
-TPC	Touch Panel Systems Corporation
-TPE	Technology Power Enterprises Inc
-TPJ	(none)
-TPK	TOPRE CORPORATION
-TPR	Topro Technology Inc
-TPS	Teleprocessing Systeme GmbH
-TPV	Top Victory Electronics ( Fujian ) Company Ltd
-TPZ	Ypoaz Systems Inc
-TRA	TriTech Microelectronics International
-TRC	Trioc AB
-TRD	Trident Microsystem Inc
-TRE	Tremetrics
-TRI	Tricord Systems
-TRL	Royal Information
-TRM	Tekram Technology Company Ltd
-TRN	Datacommunicatie Tron B.V.
-TRS	Torus Systems Ltd
-TRU	Aashima Technology B.V.
-TRX	Trex Enterprises
-TSB	Toshiba America Info Systems Inc
-TSC	Sanyo Electric Company Ltd
-TSD	TechniSat Digital GmbH
-TSE	Tottori Sanyo Electric
-TSF	Racal-Airtech Software Forge Ltd
-TSG	The Software Group Ltd
-TSI	TeleVideo Systems
-TSL	Tottori SANYO Electric Co., Ltd.
-TSP	U.S. Navy
-TST	Transtream Inc
-TSY	TouchSystems
-TTA	Topson Technology Co., Ltd.
-TTB	National Semiconductor Japan Ltd
-TTC	Telecommunications Techniques Corporation
-TTE	TTE, Inc.
-TTI	Trenton Terminals Inc
-TTK	Totoku Electric Company Ltd
-TTL	2-Tel B.V.
-TTS	TechnoTrend Systemtechnik GmbH
-TUT	Tut Systems
-TVD	Tecnovision
-TVI	Truevision
-TVM	Taiwan Video & Monitor Corporation
-TVO	TV One Ltd
-TVR	TV Interactive Corporation
-TVS	TVS Electronics Limited
-TWA	Tidewater Association
-TWE	Kontron Electronik
-TWH	Twinhead International Corporation
-TWI	Easytel oy
-TWK	TOWITOKO electronics GmbH
-TXL	Trixel Ltd
-TXN	Texas Insturments
-TXT	Textron Defense System
-TYN	Tyan Computer Corporation
-UAS	Ultima Associates Pte Ltd
-UBI	Ungermann-Bass Inc
-UBL	Ubinetics Ltd.
-UDN	Uniden Corporation
-UEC	Ultima Electronics Corporation
-UEG	Elitegroup Computer Systems Company Ltd
-UEI	Universal Electronics Inc
-UET	Universal Empowering Technologies
-UFG	UNIGRAF-USA
-UFO	UFO Systems Inc
-UHB	XOCECO
-UIC	Uniform Industrial Corporation
-UJR	Ueda Japan Radio Co., Ltd.
-ULT	Ultra Network Tech
-UMC	United Microelectr Corporation
-UMG	Umezawa Giken Co.,Ltd
-UMM	Universal Multimedia
-UNA	Unisys DSD
-UNB	Unisys Corporation
-UNC	Unisys Corporation
-UND	Unisys Corporation
-UNE	Unisys Corporation
-UNF	Unisys Corporation
-UNI	Uniform Industry Corp.
-UNI	Unisys Corporation
-UNM	Unisys Corporation
-UNO	Unisys Corporation
-UNP	Unitop
-UNS	Unisys Corporation
-UNT	Unisys Corporation
-UNY	Unicate
-UPP	UPPI
-UPS	Systems Enhancement
-URD	Video Computer S.p.A.
-USA	Utimaco Safeware AG
-USD	U.S. Digital Corporation
-USI	Universal Scientific Industrial Co., Ltd.
-USR	U.S. Robotics Inc
-UTD	Up to Date Tech
-UWC	Uniwill Computer Corp.
-VAL	Valence Computing Corporation
-VAR	Varian Australia Pty Ltd
-VBT	Valley Board Ltda
-VCC	Virtual Computer Corporation
-VCI	VistaCom Inc
-VCJ	Victor Company of Japan, Limited
-VCM	Vector Magnetics, LLC
-VCX	VCONEX
-VDA	Victor Data Systems
-VDM	Vadem
-VDO	Video & Display Oriented Corporation
-VDS	Vidisys GmbH & Company
-VDT	Viditec, Inc.
-VEC	Vector Informatik GmbH
-VEK	Vektrex
-VES	Vestel Elektronik Sanayi ve Ticaret A. S.
-VFI	VeriFone Inc
-VHI	Macrocad Development Inc.
-VIA	VIA Tech Inc
-VIB	Tatung UK Ltd
-VIC	Victron B.V.
-VID	Ingram Macrotron Germany
-VIK	Viking Connectors
-VIN	Vine Micros Ltd
-VIR	Visual Interface, Inc
-VIS	Visioneer
-VIT	Visitech AS
-VLB	ValleyBoard Ltda.
-VLT	VideoLan Technologies
-VMI	Vermont Microsystems
-VML	Vine Micros Limited
-VNC	Vinca Corporation
-VOB	MaxData Computer AG
-VPR	Best Buy
-VRC	Virtual Resources Corporation
-VSC	ViewSonic Corporation
-VSD	3M
-VSI	VideoServer
-VSN	Ingram Macrotron
-VSP	Vision Systems GmbH
-VSR	V-Star Electronics Inc.
-VTC	VTel Corporation
-VTG	Voice Technologies Group Inc
-VTI	VLSI Tech Inc
-VTK	Viewteck Co., Ltd.
-VTL	Vivid Technology Pte Ltd
-VTS	VTech Computers Ltd
-VTV	VATIV Technologies
-VUT	Vutrix (UK) Ltd
-VWB	Vweb Corp.
-WAC	Wacom Tech
-WAL	Wave Access
-WAV	Wavephore
-WBN	MicroSoftWare
-WBS	WB Systemtechnik GmbH
-WCI	Wisecom Inc
-WCS	Woodwind Communications Systems Inc
-WDC	Western Digital
-WDE	Westinghouse Digital Electronics
-WEB	WebGear Inc
-WEC	Winbond Electronics Corporation
-WEY	WEY Design AG
-WHI	Whistle Communications
-WII	Innoware Inc
-WIL	WIPRO Information Technology Ltd
-WIN	Wintop Technology Inc
-WIP	Wipro Infotech
-WKH	Uni-Take Int'l Inc.
-WLD	Wildfire Communications Inc
-WML	Wolfson Microelectronics Ltd
-WMO	Westermo Teleindustri AB
-WMT	Winmate Communication Inc
-WNI	WillNet Inc.
-WNV	Winnov L.P.
-WNX	Wincor Nixdorf International GmbH
-WPA	Matsushita Communication Industrial Co., Ltd.
-WPI	Wearnes Peripherals International (Pte) Ltd
-WRC	WiNRADiO Communications
-WSC	CIS Technology Inc
-WSP	Wireless And Smart Products Inc.
-WTC	ACC Microelectronics
-WTI	WorkStation Tech
-WTK	Wearnes Thakral Pte
-WTS	Restek Electric Company Ltd
-WVM	Wave Systems Corporation
-WWV	World Wide Video, Inc.
-WYS	Wyse Technology
-WYT	Wooyoung Image & Information Co.,Ltd.
-XAC	XAC Automation Corp
-XFG	Jan Strapko - FOTO
-XFO	EXFO Electro Optical Engineering
-XIN	Xinex Networks Inc
-XIO	Xiotech Corporation
-XIR	Xirocm Inc
-XIT	Xitel Pty ltd
-XLX	Xilinx, Inc.
-XMM	C3PO S.L.
-XNT	XN Technologies, Inc.
-XQU	SHANGHAI SVA-DAV ELECTRONICS CO., LTD
-XRC	Xircom Inc
-XRO	XORO ELECTRONICS (CHENGDU) LIMITED
-XSN	Xscreen AS
-XST	XS Technologies Inc
-XSY	XSYS
-XTD	Icuiti Corporation
-XTL	Crystal Computer
-XTN	X-10 (USA) Inc
-XYC	Xycotec Computer GmbH
-YED	Y-E Data Inc
-YHQ	Yokogawa Electric Corporation
-YHW	Exacom SA
-YMH	Yamaha Corporation
-YOW	American Biometric Company
-ZAN	Zandar Technologies plc
-ZAX	Zefiro Acoustics
-ZAZ	Zazzle Technologies
-ZBR	Zebra Technologies International, LLC
-ZCT	ZeitControl cardsystems GmbH
-ZDS	Zenith Data Systems
-ZGT	Zenith Data Systems
-ZIC	ZTEIC DESIGN CO., LTD.
-ZMT	Zalman Tech Co., Ltd.
-ZMZ	Z Microsystems
-ZNI	Zetinet Inc
-ZNX	Znyx Adv. Systems
-ZOW	Zowie Intertainment, Inc
-ZRN	Zoran Corporation
-ZSE	Zenith Data Systems
-ZTC	ZyDAS Technology Corporation
-ZTI	Zoom Telephonics Inc
-ZTM	ZT Group Int'l Inc.
-ZYD	Zydacron Inc
-ZYP	Zypcom Inc
-ZYT	Zytex Computers
-ZYX	Zyxel
-ZZZ	Boca Research Inc

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.6.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
similarity index 89%
rename from gnome-base/gnome-desktop/gnome-desktop-3.6.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
index 50e9622..4629565 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.6.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild
@@ -23,8 +23,6 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
-# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-# Latest schemas needed due to commit 7f3e3d52
 # cairo[X] needed for gnome-bg
 RDEPEND="
 	>=dev-libs/glib-2.33.3:2
@@ -38,18 +36,21 @@ RDEPEND="
 	x11-misc/xkeyboard-config
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	x11-proto/xproto
 	>=x11-proto/randrproto-1.2
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.4 )
 		app-text/yelp-tools"
 fi
 
@@ -91,9 +92,6 @@ src_prepare() {
 		$(use_enable introspection)"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 
-	# FIXME: the tarball provides an empty file
-	cp "${FILESDIR}"/pnp.ids.r1 "${S}"/libgnome-desktop/pnp.ids || die
-
 	gnome2_src_prepare
 }
 

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 4ef2283..0e5a192 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -23,8 +23,6 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
-# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-# Latest schemas needed due to commit 7f3e3d52
 # cairo[X] needed for gnome-bg
 RDEPEND="
 	>=dev-libs/glib-2.33.3:2
@@ -38,18 +36,21 @@ RDEPEND="
 	x11-misc/xkeyboard-config
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
+"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	x11-proto/xproto
 	>=x11-proto/randrproto-1.2
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.4 )
 		app-text/yelp-tools"
 fi
 
@@ -90,5 +91,6 @@ src_prepare() {
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+
 	gnome2_src_prepare
 }
\ No newline at end of file

diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
new file mode 100644
index 0000000..99b3795
--- /dev/null
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+  </use>
+</pkgmetadata>


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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2012-10-28 16:42 Gilles Dartiguelongue
  0 siblings, 0 replies; 10+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-28 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     4f5bd534dca97bab88321eac7ca7019adb688759
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 16:40:35 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 16:41:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4f5bd534

gnome-base/gnome-desktop: 3.6.0.1 → 3.6.1

Add pnp.ids.r1 from previous ebuild because it seems upstream zeroed it
in this release and it makes checks fail.

---
 gnome-base/gnome-desktop/files/pnp.ids.r1          | 2029 ++++++++++++++++++++
 ...p-3.6.0.1.ebuild => gnome-desktop-3.6.1.ebuild} |   31 +-
 gnome-base/gnome-desktop/gnome-desktop-9999.ebuild |   27 +-
 3 files changed, 2061 insertions(+), 26 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/pnp.ids.r1 b/gnome-base/gnome-desktop/files/pnp.ids.r1
new file mode 100644
index 0000000..1e1e570
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/pnp.ids.r1
@@ -0,0 +1,2029 @@
+AAE	Anatek Electronics Inc.
+AAT	Ann Arbor Technologies
+ABA	ABBAHOME INC.
+ABC	AboCom System Inc
+ABD	Allen Bradley Company
+ABE	Alcatel Bell
+ABO	D-Link Systems Inc
+ABT	Anchor Bay Technologies, Inc.
+ABV	Advanced Research Technology
+ACA	Ariel Corporation
+ACB	Aculab Ltd
+ACC	Accton Technology Corporation
+ACD	AWETA BV
+ACE	Actek Engineering Pty Ltd
+ACG	A&R Cambridge Ltd
+ACH	Archtek Telecom Corporation
+ACI	Ancor Communications Inc
+ACK	Acksys
+ACL	Apricot Computers
+ACM	Acroloop Motion Control Systems Inc
+ACO	Allion Computer Inc.
+ACP	Aspen Tech Inc
+ACR	Acer Technologies
+ACS	Altos Computer Systems
+ACT	Applied Creative Technology
+ACU	Acculogic
+ACV	ActivCard S.A
+ADA	Addi-Data GmbH
+ADB	Aldebbaron
+ADC	Acnhor Datacomm
+ADD	Advanced Peripheral Devices Inc
+ADE	Arithmos, Inc.
+ADH	Aerodata Holdings Ltd
+ADI	ADI Systems Inc
+ADK	Adtek System Science Company Ltd
+ADL	ASTRA Security Products Ltd
+ADM	Ad Lib MultiMedia Inc
+ADN	Analog & Digital Devices Tel. Inc
+ADP	Adaptec Inc
+ADR	Nasa Ames Research Center
+ADS	Analog Devices Inc
+ADT	Adtek
+ADT	Aved Display Technologies
+ADV	Advanced Micro Devices Inc
+ADX	Adax Inc
+AEC	Antex Electronics Corporation
+AED	Advanced Electronic Designs, Inc.
+AEI	Actiontec Electric Inc
+AEJ	Alpha Electronics Company
+AEM	ASEM S.p.A.
+AEP	Aetas Peripheral International
+AET	Aethra Telecomunicazioni S.r.l.
+AFA	Alfa Inc
+AGC	Beijing Aerospace Golden Card Electronic Engineering Co.,Ltd.
+AGI	Artish Graphics Inc
+AGL	Argolis
+AGM	Advan Int'l Corporation
+AGT	Agilent Technologies
+AHC	Advantech Co., Ltd.
+AIC	Arnos Insturments & Computer Systems
+AIE	Altmann Industrieelektronik
+AII	Amptron International Inc.
+AIL	Altos India Ltd
+AIM	AIMS Lab Inc
+AIR	Advanced Integ. Research Inc
+AIS	Alien Internet Services
+AIW	Aiwa Company Ltd
+AIX	ALTINEX, INC.
+AJA	AJA Video Systems, Inc.
+AKB	Akebia Ltd
+AKI	AKIA Corporation
+AKL	AMiT Ltd
+AKM	Asahi Kasei Microsystems Company Ltd
+AKP	Atom Komplex Prylad
+AKY	Askey Computer Corporation
+ALA	Alacron Inc
+ALC	Altec Corporation
+ALD	In4S Inc
+ALG	Realtek Semiconductor Corp.
+ALH	AL Systems
+ALI	Acer Labs
+ALJ	Altec Lansing
+ALK	Acrolink Inc
+ALL	Alliance Semiconductor Corporation
+ALM	Acutec Ltd.
+ALN	Alana Technologies
+ALO	Algolith Inc.
+ALP	Alps Electric Company Ltd
+ALR	Advanced Logic
+ALS	Avance Logic Inc
+ALT	Altra
+ALV	AlphaView LCD
+ALX	ALEXON Co.,Ltd.
+AMA	Asia Microelectronic Development Inc
+AMB	Ambient Technologies, Inc.
+AMC	Attachmate Corporation
+AMD	Amdek Corporation
+AMI	American Megatrends Inc
+AML	Anderson Multimedia Communications (HK) Limited
+AMN	Amimon LTD.
+AMP	AMP Inc
+AMT	AMT International Industry
+AMX	AMX LLC
+ANA	Anakron
+ANC	Ancot
+AND	Adtran Inc
+ANI	Anigma Inc
+ANK	Anko Electronic Company Ltd
+ANL	Analogix Semiconductor, Inc
+ANO	Anorad Corporation
+ANP	Andrew Network Production
+ANR	ANR Ltd
+ANS	Ansel Communication Company
+ANT	Ace CAD Enterprise Company Ltd
+ANX	Acer Netxus Inc
+AOA	AOpen Inc.
+AOE	Advanced Optics Electronics, Inc.
+AOL	America OnLine
+AOT	Alcatel
+APC	American Power Conversion
+APD	AppliAdata
+APG	Horner Electric Inc
+API	A Plus Info Corporation
+APL	Aplicom Oy
+APM	Applied Memory Tech
+APN	Appian Tech Inc
+APP	Apple Computer Inc
+APR	Aprilia s.p.a.
+APS	Autologic Inc
+APT	Audio Processing Technology Ltd
+APX	AP Designs Ltd
+ARC	Alta Research Corporation
+ARE	ICET S.p.A.
+ARG	Argus Electronics Co., LTD
+ARI	Argosy Research Inc
+ARK	Ark Logic Inc
+ARL	Arlotto Comnet Inc
+ARM	Arima
+ARO	Poso International B.V.
+ARS	Arescom Inc
+ART	Corion Industrial Corporation
+ASC	Ascom Strategic Technology Unit
+ASD	USC Information Sciences Institute
+ASE	AseV Display Labs
+ASI	Ahead Systems
+ASK	Ask A/S
+ASL	AccuScene Corporation Ltd
+ASM	ASEM S.p.A.
+ASN	Asante Tech Inc
+ASP	ASP Microelectronics Ltd
+AST	AST Research Inc
+ASU	Asuscom Network Inc
+ASX	AudioScience
+ASY	Rockwell Collins / Airshow Systems
+ATA	Allied Telesyn International (Asia) Pte Ltd
+ATC	Ably-Tech Corporation
+ATD	Alpha Telecom Inc
+ATE	Innovate Ltd
+ATH	Athena Informatica S.R.L.
+ATI	Allied Telesis KK
+ATK	Allied Telesyn Int'l
+ATL	Arcus Technology Ltd
+ATM	ATM Ltd
+ATN	Athena Smartcard Solutions Ltd.
+ATO	ASTRO DESIGN, INC.
+ATP	Alpha-Top Corporation
+ATT	AT&T
+ATV	Office Depot, Inc.
+ATX	Athenix Corporation
+AUI	Alps Electric Inc
+AUO	AU Optronics
+AUR	Aureal Semiconductor
+AUT	Autotime Corporation
+AVA	Avaya Communication
+AVC	Auravision Corporation
+AVD	Avid Electronics Corporation
+AVE	Add Value Enterpises (Asia) Pte Ltd
+AVI	Nippon Avionics Co.,Ltd
+AVM	AVM GmbH
+AVO	Avocent Corporation
+AVT	Avtek (Electronics) Pty Ltd
+AVV	SBS Technologies (Canada), Inc. (was Avvida Systems, Inc.)
+AWC	Access Works Comm Inc
+AWL	Aironet Wireless Communications, Inc
+AWS	Wave Systems
+AXB	Adrienne Electronics Corporation
+AXC	AXIOMTEK CO., LTD.
+AXE	D-Link Systems Inc (used as 2nd pnpid)
+AXI	American Magnetics
+AXL	Axel
+AXP	American Express
+AXT	Axtend Technologies Inc
+AXX	Axxon Computer Corporation
+AXY	AXYZ Automation Services, Inc
+AYD	Aydin Displays
+AYR	Airlib, Inc
+AZM	AZ Middelheim - Radiotherapy
+AZT	Aztech Systems Ltd
+BAC	Biometric Access Corporation
+BAN	Banyan
+BBB	an-najah university
+BBH	B&Bh
+BBL	Brain Boxes Limited
+BCC	Beaver Computer Corporaton
+BCD	Dr. Seufert GmbH
+BCM	Broadcom
+BCQ	Deutsche Telekom Berkom GmbH
+BCS	Booria CAD/CAM systems
+BDO	Brahler ICS
+BDR	Blonder Tongue Labs, Inc.
+BDS	Barco Display Systems
+BEC	Elektro Beckhoff GmbH
+BEI	Beckworth Enterprises Inc
+BEK	Beko Elektronik A.S.
+BEL	Beltronic Industrieelektronik GmbH
+BEO	Baug & Olufsen
+BFE	B.F. Engineering Corporation
+BGB	Barco Graphics N.V
+BGT	Budzetron Inc
+BHZ	BitHeadz, Inc.
+BIC	Big Island Communications
+BII	Boeckeler Instruments Inc
+BIL	Billion Electric Company Ltd
+BIO	BioLink Technologies International, Inc.
+BIT	Bit 3 Computer
+BLI	Busicom
+BLN	BioLink Technologies
+BLP	Bloomberg L.P.
+BMI	Benson Medical Instruments Company
+BML	BIOMED Lab
+BMS	BIOMEDISYS
+BNE	Bull AB
+BNK	Banksia Tech Pty Ltd
+BNO	Bang & Olufsen
+BNS	Boulder Nonlinear Systems
+BOB	Rainy Orchard
+BOE	BOE
+BOS	BOS
+BPD	Micro Solutions, Inc.
+BPU	Best Power
+BRC	BARC
+BRG	Bridge Information Co., Ltd
+BRI	Boca Research Inc
+BRM	Braemar Inc
+BRO	BROTHER INDUSTRIES,LTD.
+BSE	Bose Corporation
+BSL	Biomedical Systems Laboratory
+BST	BodySound Technologies, Inc.
+BTC	Bit 3 Computer
+BTE	Brilliant Technology
+BTF	Bitfield Oy
+BTI	BusTech Inc
+BUF	Yasuhiko Shirai Melco Inc
+BUJ	ATI Tech Inc
+BUL	Bull
+BUR	Bernecker & Rainer Ind-Eletronik GmbH
+BUS	BusTek
+BUT	21ST CENTURY ENTERTAINMENT
+BWK	Bitworks Inc.
+BXE	Buxco Electronics
+BYD	byd:sign corporation
+CAA	Castles Automation Co., Ltd
+CAC	CA & F Elettronica
+CAG	CalComp
+CAI	Canon Inc.
+CAL	Acon
+CAM	Cambridge Audio
+CAN	Canopus Company Ltd
+CAN	Carrera Computer Inc
+CAN	CORNEA
+CAR	Cardinal Company Ltd
+CAS	CASIO COMPUTER CO.,LTD
+CAT	Consultancy in Advanced Technology
+CBI	ComputerBoards Inc
+CBR	Cebra Tech A/S
+CBX	Cybex Computer Products Corporation
+CCC	C-Cube Microsystems
+CCI	Cache
+CCJ	CONTEC CO.,LTD.
+CCL	CCL/ITRI
+CCP	Capetronic USA Inc
+CDC	Core Dynamics Corporation
+CDD	Convergent Data Devices
+CDE	Colin.de
+CDG	Christie Digital Systems Inc
+CDI	Concept Development Inc
+CDK	Cray Communications
+CDN	Codenoll Technical Corporation
+CDP	CalComp
+CDS	Computer Diagnostic Systems
+CDT	IBM Corporation
+CDV	Convergent Design Inc.
+CEA	Consumer Electronics Association
+CEC	Chicony Electronics Company Ltd
+CED	Cambridge Electronic Design Ltd
+CEF	Cefar Digital Vision
+CEI	Crestron Electronics, Inc.
+CEM	MEC Electronics GmbH
+CEN	Centurion Technologies P/L
+CEP	C-DAC
+CER	Ceronix
+CET	TEC CORPORATION
+CFG	Atlantis
+CGA	Chunghwa Picture Tubes, LTD
+CGS	Chyron Corp
+CHA	Chase Research PLC
+CHC	Chic Technology Corp.
+CHD	ChangHong Electric Co.,Ltd
+CHE	Acer Inc
+CHG	Sichuan Changhong Electric CO, LTD.
+CHI	Chrontel Inc
+CHL	Chloride-R&D
+CHM	CHIC TECHNOLOGY CORP.
+CHO	Sichuang Changhong Corporation
+CHP	CH Products
+CHS	Agentur Chairos
+CHT	Chunghwa Picture Tubes,LTD.
+CHY	Cherry GmbH
+CIC	Comm. Intelligence Corporation
+CII	Cromack Industries Inc
+CIL	Citicom Infotech Private Limited
+CIN	Citron GmbH
+CIP	Ciprico Inc
+CIR	Cirrus Logic Inc
+CIS	Cisco Systems Inc
+CIT	Citifax Limited
+CKC	The Concept Keyboard Company Ltd
+CLA	Clarion Company Ltd
+CLD	COMMAT L.t.d.
+CLE	Classe Audio
+CLG	CoreLogic
+CLI	Cirrus Logic Inc
+CLM	CrystaLake Multimedia
+CLO	Clone Computers
+CLT	automated computer control systems
+CLV	Clevo Company
+CLX	CardLogix
+CMC	CMC Ltd
+CMD	Colorado MicroDisplay, Inc.
+CMG	Chenming Mold Ind. Corp.
+CMI	C-Media Electronics
+CMM	Comtime GmbH
+CMO	Chi Mei Optoelectronics corp.
+CMR	Cambridge Research Systems Ltd
+CMS	CompuMaster Srl
+CMX	Comex Electronics AB
+CNB	American Power Conversion
+CNC	Alvedon Computers Ltd
+CNE	Cine-tal
+CNI	Connect Int'l A/S
+CNN	Canon Inc
+CNT	COINT Multimedia Systems
+COB	COBY Electronics Co., Ltd
+COD	CODAN Pty. Ltd.
+COI	Codec Inc.
+COL	Rockwell Collins, Inc.
+COM	Comtrol Corporation
+CON	Contec Company Ltd
+COR	Corollary Inc
+COS	CoStar Corporation
+COT	Core Technology Inc
+COW	Polycow Productions
+CPC	Ciprico Inc
+CPD	CompuAdd
+CPI	Computer Peripherals Inc
+CPL	Compal Electronics Inc
+CPQ	Compaq Computer Company
+CPT	cPATH
+CPX	Powermatic Data Systems
+CRC	CONRAC GmbH
+CRD	Cardinal Technical Inc
+CRE	Creative Labs Inc
+CRI	Crio Inc.
+CRL	Creative Logic  
+CRN	Cornerstone Imaging
+CRO	Extraordinary Technologies PTY Limited
+CRQ	Cirque Corporation
+CRS	Crescendo Communication Inc
+CRX	Cyrix Corporation
+CSB	Transtex SA
+CSC	Crystal Semiconductor
+CSD	Cresta Systems Inc
+CSE	Concept Solutions & Engineering
+CSI	Cabletron System Inc
+CSO	California Institute of Technology
+CSS	CSS Laboratories
+CST	CSTI Inc
+CTA	CoSystems Inc
+CTC	CTC Communication Development Company Ltd
+CTE	Chunghwa Telecom Co., Ltd.
+CTL	Creative Technology Ltd
+CTM	Computerm Corporation
+CTN	Computone Products
+CTP	Computer Technology Corporation
+CTS	Comtec Systems Co., Ltd.
+CTX	Creatix Polymedia GmbH
+CUB	Cubix Corporation
+CUK	Calibre UK Ltd
+CVS	Clarity Visual Systems
+CWR	Connectware Inc
+CXT	Conexant Systems
+CYB	CyberVision
+CYC	Cylink Corporation
+CYD	Cyclades Corporation
+CYL	Cyberlabs
+CYT	Cytechinfo Inc
+CYV	Cyviz AS
+CYW	Cyberware
+CYX	Cyrix Corporation
+DAC	Digital Acoustics Corporation
+DAE	Digatron Industrie Elektronik GmbH
+DAI	DAIS SET Ltd.
+DAK	Daktronics
+DAL	Digital Audio Labs Inc
+DAS	DAVIS AS
+DAT	Datel Inc
+DAU	Daou Tech Inc
+DAV	Davicom Semiconductor Inc
+DAW	DA2 Technologies Inc
+DAX	Data Apex Ltd
+DBD	Diebold Inc.
+DBI	DigiBoard Inc
+DBK	Databook Inc
+DBL	Doble Engineering Company
+DBN	DB Networks Inc
+DCA	Digital Communications Association
+DCC	Dale Computer Corporation
+DCD	Datacast LLC
+DCE	dSPACE GmbH
+DCI	Concepts Inc
+DCL	Dynamic Controls Ltd
+DCM	DCM Data Products
+DCO	Dialogue Technology Corporation
+DCR	Decros Ltd
+DCS	Diamond Computer Systems Inc
+DCT	Dancall Telecom A/S
+DCV	Datatronics Technology Inc
+DDA	DA2 Technologies Corporation
+DDD	Danka Data Devices
+DDI	Data Display AG
+DDS	Barco, n.v.
+DDT	Datadesk Technologies Inc
+DEC	Digital Equipment Corporation
+DEI	Deico Electronics
+DEL	Dell
+DEN	Densitron Computers Ltd
+DEX	idex displays
+DFI	DFI
+DFK	SharkTec A/S
+DGA	Digiital Arts Inc
+DGC	Data General Corporation
+DGI	DIGI International
+DGK	DugoTech Co., LTD
+DGP	Digicorp European sales S.A.
+DGS	Diagsoft Inc
+DGT	Dearborn Group Technology
+DGT	The Dearborn Group
+DHP	DH Print
+DHQ	Quadram
+DHT	Projectavision Inc
+DIA	Diadem
+DIG	Digicom S.p.A.
+DII	Dataq Instruments Inc
+DIM	dPict Imaging, Inc.
+DIN	Daintelecom Co., Ltd
+DIS	Diseda S.A.
+DIT	Dragon Information Technology
+DJE	Capstone Visual Product Development
+DJP	Maygay Machines, Ltd
+DKY	Datakey Inc
+DLC	Diamond Lane Comm. Corporation
+DLG	Digital-Logic GmbH
+DLK	D-Link Systems Inc
+DLT	Digitelec Informatique Park Cadera
+DMB	Digicom Systems Inc
+DMC	Dune Microsystems Corporation
+DMM	Dimond Multimedia Systems Inc
+DMP	D&M Holdings Inc, Professional Business Company
+DMS	DOME imaging systems
+DMV	NDS Ltd
+DNA	DNA Enterprises, Inc.
+DNG	Apache Micro Peripherals Inc
+DNI	Deterministic Networks Inc.
+DNT	Dr. Neuhous Telekommunikation GmbH
+DNV	DiCon
+DOL	Dolman Technologies Group Inc
+DOM	Dome Imaging Systems
+DON	DENON, Ltd.
+DOT	Dotronic Mikroelektronik GmbH
+DPA	DigiTalk Pro AV
+DPC	Delta Electronics Inc
+DPI	DocuPoint
+DPL	Digital Projection Limited
+DPM	ADPM Synthesis sas
+DPS	Digital Processing Systems
+DPT	DPT
+DPX	DpiX, Inc.
+DQB	Datacube Inc
+DRB	Dr. Bott KG
+DRC	Data Ray Corp.
+DRD	DIGITAL REFLECTION INC.
+DRI	Data Race Inc
+DSD	DS Multimedia Pte Ltd
+DSI	Digitan Systems Inc
+DSM	DSM Digital Services GmbH
+DSP	Domain Technology Inc
+DTA	DELTATEC
+DTC	DTC Tech Corporation
+DTI	Diversified Technology, Inc.
+DTK	Dynax Electronics (HK) Ltd
+DTL	e-Net Inc
+DTN	Datang Telephone Co
+DTO	Deutsche Thomson OHG
+DTX	Data Translation
+DUA	Dosch & Amand GmbH & Company KG
+DUN	NCR Corporation
+DVD	Dictaphone Corporation
+DVL	Devolo AG
+DVS	Digital Video System
+DVT	Data Video
+DWE	Daewoo Electronics Company Ltd
+DXC	Digipronix Control Systems
+DXP	Data Expert Corporation
+DXS	Signet
+DYC	Dycam Inc
+DYM	Dymo-CoStar Corporation
+DYN	Askey Computer Corporation
+DYX	Dynax Electronics (HK) Ltd
+EAS	Evans and Sutherland Computer
+EBH	Data Price Informatica
+EBT	HUALONG TECHNOLOGY CO., LTD
+ECA	Electro Cam Corp.
+ECC	ESSential Comm. Corporation
+ECI	Enciris Technologies
+ECK	Eugene Chukhlomin Sole Proprietorship, d.b.a.
+ECL	Excel Company Ltd
+ECM	E-Cmos Tech Corporation
+ECO	Echo Speech Corporation
+ECP	Elecom Company Ltd
+ECS	Elitegroup Computer Systems Company Ltd
+ECT	Enciris Technologies
+EDC	e.Digital Corporation
+EDG	Electronic-Design GmbH
+EDI	Edimax Tech. Company Ltd
+EDM	EDMI
+EEE	ET&T Technology Company Ltd
+EEH	EEH Datalink GmbH
+EEP	E.E.P.D. GmbH
+EES	EE Solutions, Inc.
+EGD	EIZO GmbH Display Technologies
+EGL	Eagle Technology
+EGN	Egenera, Inc.
+EGO	Ergo Electronics
+EHJ	Epson Research
+EIC	Eicon Technology Corporation
+EKA	MagTek Inc.
+EKC	Eastman Kodak Company
+EKS	EKSEN YAZILIM
+ELA	ELAD srl
+ELC	Electro Scientific Ind
+ELE	Elecom Company Ltd
+ELG	Elmeg GmbH Kommunikationstechnik
+ELI	Edsun Laboratories
+ELL	Electrosonic Ltd
+ELM	Elmic Systems Inc
+ELO	Elo TouchSystems Inc
+ELO	Tyco Electronics
+ELS	ELSA GmbH
+ELT	Element Labs, Inc.
+ELX	Elonex PLC
+EMB	Embedded computing inc ltd
+EMC	eMicro Corporation
+EME	EMiNE TECHNOLOGY COMPANY, LTD.
+EMG	EMG Consultants Inc
+EMI	Ex Machina Inc
+EMU	Emulex Corporation
+ENC	Eizo Nanao Corporation
+END	ENIDAN Technologies Ltd
+ENE	ENE Technology Inc.
+ENI	Efficient Networks
+ENS	Ensoniq Corporation
+ENT	Enterprise Comm. & Computing Inc
+EPC	Empac
+EPI	Envision Peripherals, Inc
+EPN	EPiCON Inc.
+EPS	KEPS
+EQP	Equipe Electronics Ltd.
+EQX	Equinox Systems Inc
+ERG	Ergo System
+ERI	Ericsson Mobile Communications AB
+ERN	Ericsson, Inc.
+ERP	Euraplan GmbH
+ERT	Escort Insturments Corporation
+ESC	Eden Sistemas de Computacao S/A
+ESG	ELCON Systemtechnik GmbH
+ESI	Extended Systems, Inc.
+ESK	ES&S
+ESS	ESS Technology Inc
+EST	Embedded Solution Technology
+ESY	E-Systems Inc
+ETC	Everton Technology Company Ltd
+ETI	Eclipse Tech Inc
+ETK	eTEK Labs Inc.
+ETL	Evertz Microsystems Ltd.
+ETS	Electronic Trade Solutions Ltd
+ETT	E-Tech Inc
+EUT	Ericsson Mobile Networks B.V.
+EVI	eviateg GmbH
+EVX	Everex
+EXA	Exabyte
+EXC	Excession Audio
+EXI	Exide Electronics
+EXN	RGB Systems, Inc. dba Extron Electronics
+EXP	Data Export Corporation
+EXT	Exatech Computadores & Servicos Ltda
+EXX	Exxact GmbH
+EXY	Exterity Ltd
+EZE	EzE Technologies
+EZP	Storm Technology
+FAR	Farallon Computing
+FBI	Interface Corporation
+FCB	Furukawa Electric Company Ltd
+FCG	First International Computer Ltd
+FCS	Focus Enhancements, Inc.
+FDC	Future Domain
+FDT	Fujitsu Display Technologies Corp.
+FEC	FURUNO ELECTRIC CO., LTD.
+FEL	Fellowes & Questec
+FER	Ferranti Int'L
+FFI	Fairfield Industries
+FGD	Lisa Draexlmaier GmbH
+FGL	Fujitsu General Limited.
+FHL	FHLP
+FIC	Formosa Industrial Computing Inc
+FIL	Forefront Int'l Ltd
+FIN	Finecom Co., Ltd.
+FIR	Chaplet Systems Inc
+FIS	FLY-IT Simulators
+FJC	Fujitsu Takamisawa Component Limited
+FJS	Fujitsu Spain
+FJT	F.J. Tieman BV
+FLI	Faroudja Laboratories
+FLY	Butterfly Communications
+FMA	Fast Multimedia AG
+FMC	Ford Microelectronics Inc
+FMI	Fellowes, Inc.
+FMI	Fujitsu Microelect Inc
+FML	Fujitsu Microelect Ltd
+FMZ	Formoza-Altair
+FNC	Fanuc LTD
+FNI	Funai Electric Co., Ltd.
+FOA	FOR-A Company Limited
+FOS	Foss Tecator
+FPE	Fujitsu Peripherals Ltd
+FPS	Deltec Corporation
+FPX	Cirel Systemes
+FRC	Force Computers
+FRD	Freedom Scientific BLV
+FRE	Forvus Research Inc
+FRI	Fibernet Research Inc
+FRS	South Mountain Technologies, LTD
+FSC	Future Systems Consulting KK
+FSI	Fore Systems Inc
+FST	Modesto PC Inc
+FTC	Futuretouch Corporation
+FTE	Frontline Test Equipment Inc.
+FTG	FTG Data Systems
+FTI	FastPoint Technologies, Inc.
+FTN	Fountain Technologies Inc
+FTR	Mediasonic
+FUJ	Fujitsu Ltd
+FUN	sisel muhendislik
+FUS	Fujitsu Siemens Computers GmbH
+FVC	First Virtual Corporation
+FVX	C-C-C Group Plc
+FWR	Flat Connections Inc
+FXX	Fuji Xerox
+FZC	Founder Group Shenzhen Co.
+FZI	FZI Forschungszentrum Informatik
+GAG	Gage Applied Sciences Inc
+GAL	Galil Motion Control
+GAU	Gaudi Co., Ltd.
+GCC	GCC Technologies Inc
+GCI	Gateway Comm. Inc
+GCS	Grey Cell Systems Ltd
+GDC	General Datacom
+GDI	G. Diehl ISDN GmbH
+GDS	GDS
+GDT	Vortex Computersysteme GmbH
+GEF	GE Fanuc Embedded Systems
+GEM	Gem Plus
+GEN	Genesys ATE Inc
+GEO	GEO Sense
+GES	GES Singapore Pte Ltd
+GFM	GFMesstechnik GmbH
+GFN	Gefen Inc.
+GIC	General Inst. Corporation
+GIM	Guillemont International
+GIS	AT&T Global Info Solutions
+GJN	Grand Junction Networks
+GLE	AD electronics
+GLM	Genesys Logic
+GLS	Gadget Labs LLC
+GMK	GMK Electronic Design GmbH
+GML	General Information Systems
+GMM	GMM Research Inc
+GMN	GEMINI 2000 Ltd
+GMX	GMX Inc
+GND	Gennum Corporation
+GNN	GN Nettest Inc
+GNZ	Gunze Ltd
+GRA	Graphica Computer
+GRE	GOLD RAIN ENTERPRISES CORP.
+GRH	Granch Ltd
+GRV	Advanced Gravis
+GRY	Robert Gray Company
+GSB	NIPPONDENCHI CO,.LTD
+GSC	General Standards Corporation
+GSM	Goldstar Company Ltd
+GST	Graphic SystemTechnology
+GSY	Grossenbacher Systeme AG
+GTC	Graphtec Corporation
+GTI	Goldtouch
+GTK	G-Tech Corporation
+GTM	Garnet System Company Ltd
+GTS	Geotest Marvin Test Systems Inc
+GTT	General Touch Technology Co., Ltd.
+GUD	Guntermann & Drunck GmbH
+GUZ	Guzik Technical Enterprises
+GVC	GVC Corporation
+GVL	Global Village Communication
+GWI	GW Instruments
+GWY	Gateway 2000
+GZE	GUNZE Limited
+HAE	Haider electronics
+HAI	Haivision Systems Inc.
+HAL	Halberthal
+HAN	Hanchang System Corporation
+HAY	Hayes Microcomputer Products Inc
+HCA	DAT
+HCL	HCL America Inc
+HCM	HCL Peripherals
+HCP	Hitachi Computer Products Inc
+HCW	Hauppauge Computer Works Inc
+HDC	HardCom Elektronik & Datateknik
+HDI	HD-INFO d.o.o.
+HDV	Holografika kft.
+HEC	Hisense Electric Co., Ltd.
+HEC	Hitachi Engineering Company Ltd
+HEL	Hitachi Micro Systems Europe Ltd
+HER	Ascom Business Systems
+HET	HETEC Datensysteme GmbH
+HHC	HIRAKAWA HEWTECH CORP.
+HIB	Hibino Corporation
+HIC	Hitachi Information Technology Co., Ltd.
+HIK	Hikom Co., Ltd.
+HIL	Hilevel Technology
+HIT	Hitachi America Ltd
+HJI	Harris & Jeffries Inc
+HKA	HONKO MFG. CO., LTD.
+HKG	Josef Heim KG
+HMC	Hualon Microelectric Corporation
+HMK	hmk Daten-System-Technik BmbH
+HMX	HUMAX Co., Ltd.
+HNS	Hughes Network Systems
+HOB	HOB Electronic GmbH
+HOE	Hosiden Corporation
+HOL	Holoeye Photonics AG
+HPC	Hewlett Packard Co.
+HPD	Hewlett Packard
+HPI	Headplay, Inc.
+HPK	HAMAMATSU PHOTONICS K.K.
+HPQ	HP
+HPR	H.P.R. Electronics GmbH
+HRC	Hercules
+HRE	Qingdao Haier Electronics Co., Ltd.
+HRL	Herolab GmbH
+HRS	Harris Semiconductor
+HRT	HERCULES
+HSC	Hagiwara Sys-Com Company Ltd
+HSM	AT&T Microelectronics
+HTC	Hitachi Ltd
+HTI	Hampshire Company, Inc.
+HTK	Holtek Microelectronics Inc
+HTX	Hitex Systementwicklung GmbH
+HUB	GAI-Tronics, A Hubbell Company
+HUM	IMP Electronics Ltd.
+HWA	Harris Canada Inc
+HWC	DBA Hans Wedemeyer
+HWD	Highwater Designs Ltd
+HWP	Hewlett Packard
+HXM	Hexium Ltd.
+HYC	Hypercope Gmbh Aachen
+HYO	HYC CO., LTD.
+HYP	Hyphen Ltd
+HYR	Hypertec Pty Ltd
+HYT	Heng Yu Technology (HK) Limited
+HYV	Hynix Semiconductor
+IAF	Institut f r angewandte Funksystemtechnik GmbH
+IAI	Integration Associates, Inc.
+IAT	IAT Germany GmbH
+IBC	Integrated Business Systems
+IBI	INBINE.CO.LTD
+IBM	IBM Brasil
+IBM	IBM France
+IBP	IBP Instruments GmbH
+IBR	IBR GmbH
+ICA	ICA Inc
+ICC	BICC Data Networks Ltd
+ICD	ICD Inc
+ICE	IC Ensemble
+ICI	Infotek Communication Inc
+ICM	Intracom SA
+ICN	Sanyo Icon
+ICO	Intel Corp
+ICS	Integrated Circuit Systems
+ICX	ICCC A/S
+IDC	International Datacasting Corporation
+IDE	IDE Associates
+IDK	IDK Corporation
+IDO	IDEO Product Development
+IDS	Interdigital Sistemas de Informacao
+IDT	International Display Technology
+IDX	IDEXX Labs
+IEC	Interlace Engineering Corporation
+IEE	IEE
+IEI	Interlink Electronics
+IFS	In Focus Systems Inc
+IFT	Informtech
+IFX	Infineon Technologies AG
+IGC	Intergate Pty Ltd
+IGM	IGM Communi
+IIC	ISIC Innoscan Industrial Computers A/S
+III	Intelligent Instrumentation
+IIN	IINFRA Co., Ltd
+IKS	Ikos Systems Inc
+ILC	Image Logic Corporation
+ILS	Innotech Corporation
+IMA	Imagraph
+IMC	IMC Networks
+IMD	ImasDe Canarias S.A.
+IME	Imagraph
+IMG	IMAGENICS Co., Ltd.
+IMI	International Microsystems Inc
+IMM	Immersion Corporation
+IMN	Impossible Production
+IMP	Impression Products Incorporated
+IMT	Inmax Technology Corporation
+INC	Home Row Inc
+IND	ILC
+INE	Inventec Electronics (M) Sdn. Bhd.
+INF	Inframetrics Inc
+ING	Integraph Corporation
+INI	Initio Corporation
+INK	Indtek Co., Ltd.
+INL	InnoLux Display Corporation
+INM	InnoMedia Inc
+INN	Innovent Systems, Inc.
+INO	Innolab Pte Ltd
+INP	Interphase Corporation
+INS	Ines GmbH
+INT	Interphase Corporation
+inu	Inovatec S.p.A.
+INV	Inviso, Inc.
+INZ	Best Buy
+IOA	CRE Technology Corporation
+IOD	I-O Data Device Inc
+IOM	Iomega
+ION	Inside Out Networks
+IOS	i-O Display System
+IOT	I/OTech Inc
+IPC	IPC Corporation
+IPD	Industrial Products Design, Inc.
+IPI	Intelligent Platform Management Interface (IPMI) forum (Intel, HP, NEC, Dell)
+IPM	IPM Industria Politecnica Meridionale SpA
+IPN	Performance Technologies
+IPR	Ithaca Peripherals
+IPS	IPS, Inc. (Intellectual Property Solutions, Inc.)
+IPT	International Power Technologies
+IPW	IPWireless, Inc
+IQT	IMAGEQUEST Co., Ltd
+IRD	IRdata
+ISA	Symbol Technologies
+ISC	Id3 Semiconductors
+ISG	Insignia Solutions Inc
+ISI	Interface Solutions
+ISL	Isolation Systems
+ISP	IntreSource Systems Pte Ltd
+ISR	INSIS Co., LTD.
+ISS	ISS Inc
+IST	Intersolve Technologies
+ISY	International Integrated Systems,Inc.(IISI)
+ITA	Itausa Export North America
+ITC	Intercom Inc
+ITD	Internet Technology Corporation
+ITE	Integrated Tech Express Inc
+ITK	ITK Telekommunikation AG
+ITL	Inter-Tel
+ITM	ITM inc.
+ITN	The NTI Group
+ITP	IT-PRO Consulting und Systemhaus GmbH
+ITR	Infotronic America, Inc.
+ITS	IDTECH
+ITT	I&T Telecom.
+ITX	integrated Technology Express Inc
+IUC	ICSL
+IVI	Intervoice Inc
+IVM	Liyama North America
+IWR	Icuiti Corporation
+IWX	Intelliworxx, Inc.
+IXD	Intertex Data AB
+JAC	Astec Inc
+JAE	Japan Aviation Electronics Industry, Limited
+JAT	Jaton Corporation
+JAZ	Carrera Computer Inc (used as second pnpid)
+JCE	Jace Tech Inc
+JDL	Japan Digital Laboratory Co.,Ltd.
+JEN	N-Vision
+JET	JET POWER TECHNOLOGY CO., LTD.
+JFX	Jones Futurex Inc
+JGD	University College
+JIC	Jaeik Information & Communication Co., Ltd.
+JMT	Micro Technical Company Ltd
+JPC	JPC Technology Limited
+JPW	Wallis Hamilton Industries
+JQE	CNet Technical Inc
+JSD	JS DigiTech, Inc
+JSI	Jupiter Systems, Inc.
+JSK	SANKEN ELECTRIC CO., LTD
+JTS	JS Motorsports
+JUK	Janich & Klass Computertechnik GmbH
+JUP	Jupiter Systems
+JVC	JVC
+JWD	Video International Inc.
+JWL	Jewell Instruments, LLC
+JWS	JWSpencer & Co.
+JWY	Jetway Information Co., Ltd
+KAR	Karna
+KBI	Kidboard Inc
+KBL	Kobil Systems GmbH
+KCL	Keycorp Ltd
+KDE	KDE
+KDK	Kodiak Tech
+KDM	Korea Data Systems Co., Ltd.
+KDS	KDS USA
+KEC	Kyushu Electronics Systems Inc
+KEM	Kontron Embedded Modules GmbH
+KES	Kesa Corporation
+KEY	Key Tech Inc
+KFC	SCD Tech
+KFX	Kofax Image Products
+KIS	KiSS Technology A/S
+KMC	Mitsumi Company Ltd
+KML	Kensington Microware Ltd
+KNC	Konica corporation
+KNX	Nutech Marketing PTL
+KOB	Kobil Systems GmbH
+KOD	Eastman Kodak Company
+KOE	KOLTER ELECTRONIC
+KOL	Kollmorgen Motion Technologies Group
+KOW	KOWA Company,LTD.
+KPC	King Phoenix Company
+KRL	Krell Industries Inc.
+KRY	Kroy LLC
+KSC	Kinetic Systems Corporation
+KSL	Karn Solutions Ltd.
+KSX	King Tester Corporation
+KTC	Kingston Tech Corporation
+KTE	K-Tech
+KTG	Kayser-Threde GmbH
+KTI	Konica Technical Inc
+KTK	Key Tronic Corporation
+KTN	Katron Tech Inc
+KUR	Kurta Corporation
+KVA	Kvaser AB
+KWD	Kenwood Corporation
+KYC	Kyocera Corporation
+KYE	KYE Syst Corporation
+KYK	Samsung Electronics America Inc
+KZI	K-Zone International co. Ltd.
+KZN	K-Zone International
+LAB	ACT Labs Ltd
+LAC	LaCie
+LAF	Microline
+LAG	Laguna Systems
+LAN	Sodeman Lancom Inc
+LAS	LASAT Comm. A/S
+LAV	Lava Computer MFG Inc
+LBO	Lubosoft
+LCC	LCI
+LCD	Toshiba Matsushita Display Technology Co., Ltd
+LCE	La Commande Electronique
+LCI	Lite-On Communication Inc
+LCM	Latitude Comm.
+LCN	LEXICON
+LCS	Longshine Electronics Company
+LCT	Labcal Technologies
+LDT	LogiDataTech Electronic GmbH
+LEC	Lectron Company Ltd
+LED	Long Engineering Design Inc
+LEG	Legerity, Inc
+LEN	Lenovo Group Limited
+LEO	First International Computer Inc
+LEX	Lexical Ltd
+LGC	Logic Ltd
+LGI	Logitech Inc
+LGS	LG Semicom Company Ltd
+LGX	Lasergraphics, Inc.
+LHA	Lars Haagh ApS
+LHE	Lung Hwa Electronics Company Ltd
+LIT	Lithics Silicon Technology
+LJX	Datalogic Corporation
+LKM	Likom Technology Sdn. Bhd.
+LMG	Lucent Technologies
+LMI	Lexmark Int'l Inc
+LMP	Leda Media Products
+LMT	Laser Master
+LND	Land Computer Company Ltd
+LNK	Link Tech Inc
+LNR	Linear Systems Ltd.
+LNT	LANETCO International
+LNV	Lenovo
+LOC	Locamation B.V.
+LOE	Loewe Opta GmbH
+LOG	Logicode Technology Inc
+LPE	El-PUSK Co., Ltd.
+LPI	Design Technology
+LPL	LG Philips
+LSC	LifeSize Communications
+LSI	Loughborough Sound Images
+LSJ	LSI Japan Company Ltd
+LSL	Logical Solutions
+LSY	LSI Systems Inc
+LTC	Labtec Inc
+LTI	Jongshine Tech Inc
+LTK	Lucidity Technology Company Ltd
+LTN	Litronic Inc
+LTS	LTS Scale LLC
+LTV	Leitch Technology International Inc.
+LTW	Lightware, Inc
+LUC	Lucent Technologies
+LUM	Lumagen, Inc.
+LUX	Luxxell Research Inc
+LWC	Labway Corporation
+LWR	Lightware Visual Engineering
+LWW	Lanier Worldwide
+LXN	Luxeon
+LXS	ELEA CardWare
+LZX	Lightwell Company Ltd
+MAC	MAC System Company Ltd
+MAD	Xedia Corporation
+MAE	Maestro Pty Ltd
+MAG	MAG InnoVision
+MAI	Mutoh America Inc
+MAL	Meridian Audio Ltd
+MAN	LGIC
+MAS	Mass Inc.
+MAT	Matsushita Electric Ind. Company Ltd
+MAX	Rogen Tech Distribution Inc
+MAY	Maynard Electronics
+MAZ	MAZeT GmbH
+MBC	MBC
+MBD	Microbus PLC
+MBM	Marshall Electronics
+MBV	Moreton Bay
+MCA	American Nuclear Systems Inc
+MCC	Micro Industries
+MCD	McDATA Corporation
+MCE	Metz-Werke GmbH & Co KG
+MCG	Motorola Computer Group
+MCI	Micronics Computers
+MCL	Motorola Communications Israel
+MCM	Metricom Inc
+MCN	Micron Electronics Inc
+MCO	Motion Computing Inc.
+MCP	Magni Systems Inc
+MCQ	Mat's Computers
+MCR	Marina Communicaitons
+MCS	Micro Computer Systems
+MCT	Microtec
+MDA	Media4 Inc
+MDC	Midori Electronics
+MDD	MODIS
+MDG	Madge Networks
+MDI	Micro Design Inc
+MDK	Mediatek Corporation
+MDO	Panasonic
+MDR	Medar Inc
+MDS	Micro Display Systems Inc
+MDT	Magus Data Tech
+MDV	MET Development Inc
+MDX	MicroDatec GmbH
+MDY	Microdyne Inc
+MEC	Mega System Technologies Inc
+MED	Messeltronik Dresden GmbH
+MEE	Mitsubishi Electric Engineering Co., Ltd.
+MEG	Abeam Tech Ltd
+MEI	Panasonic Industry Company
+MEL	Mitsubishi Electric Corporation
+MEN	MEN Mikroelectronik Nueruberg GmbH
+MEQ	Matelect Ltd.
+MET	Metheus Corporation
+MFG	MicroField Graphics Inc
+MFI	Micro Firmware
+MFR	MediaFire Corp.
+MGA	Mega System Technologies, Inc.
+MGE	Schneider Electric S.A.
+MGL	M-G Technology Ltd
+MGT	Megatech R & D Company
+MIC	Micom Communications Inc
+MID	miro Displays
+MII	Mitec Inc
+MIL	Marconi Instruments Ltd
+MIP	micronpc.com
+MIR	Miro Computer Prod.
+MIS	Modular Industrial Solutions Inc
+MIT	MCM Industrial Technology GmbH
+MJI	MARANTZ JAPAN, INC.
+MJS	MJS Designs
+MKC	Media Tek Inc.
+MKT	MICROTEK Inc.
+MKV	Trtheim Technology
+MLD	Deep Video Imaging Ltd
+MLG	Micrologica AG
+MLI	McIntosh Laboratory Inc.
+MLM	Millennium Engineering Inc
+MLN	Mark Levinson
+MLS	Milestone EPE
+MLX	Mylex Corporation
+MMA	Micromedia AG
+MMD	Micromed Biotecnologia Ltd
+MMF	Minnesota Mining and Manufacturing
+MMI	Multimax
+MMM	Electronic Measurements
+MMN	MiniMan Inc
+MMS	MMS Electronics
+MNC	Mini Micro Methods Ltd
+MNL	Monorail Inc
+MNP	Microcom
+MOD	Modular Technology
+MOM	Momentum Data Systems
+MOS	Moses Corporation
+MOT	Motorola UDS
+MPC	M-Pact Inc
+MPI	Mediatrix Peripherals Inc
+MPJ	Microlab
+MPL	Maple Research Inst. Company Ltd
+MPN	Mainpine Limited
+MPS	mps Software GmbH
+MPX	Micropix Technologies, Ltd.
+MQP	MultiQ Products AB
+MRA	Miranda Technologies Inc
+MRC	Marconi Simulation & Ty-Coch Way Training
+MRD	MicroDisplay Corporation
+MRK	Maruko & Company Ltd
+MRL	Miratel
+MRO	Medikro Oy
+MRT	Merging Technologies
+MSA	Micro Systemation AB
+MSC	Mouse Systems Corporation
+MSD	Datenerfassungs- und Informationssysteme
+MSF	M-Systems Flash Disk Pioneers
+MSG	MSI GmbH
+MSH	Microsoft
+MSI	Microstep
+MSK	Megasoft Inc
+MSL	MicroSlate Inc.
+MSM	Advanced Digital Systems
+MSP	Mistral Solutions [P] Ltd.
+MST	MS Telematica
+MSU	motorola
+MSV	Mosgi Corporation
+MSX	Micomsoft Co., Ltd.
+MSY	MicroTouch Systems Inc
+MTB	Media Technologies Ltd.
+MTC	Mars-Tech Corporation
+MTD	MindTech Display Co. Ltd
+MTE	MediaTec GmbH
+MTH	Micro-Tech Hearing Instruments
+MTI	MaxCom Technical Inc
+MTI	Motorola Inc.
+MTK	Microtek International Inc.
+MTL	Mitel Corporation
+MTN	Mtron Storage Technology Co., Ltd.
+MTR	Mitron computer Inc
+MTS	Multi-Tech Systems
+MTU	Mark of the Unicorn Inc
+MTX	Matrox
+MUD	Multi-Dimension Institute
+MUK	mainpine limited
+MVD	Microvitec PLC
+MVI	Media Vision Inc
+MVM	SOBO VISION
+MVS	Microvision
+MVX	COM 1
+MWI	Multiwave Innovation Pte Ltd
+MWR	mware
+MWY	Microway Inc
+MXD	MaxData Computer GmbH & Co.KG
+MXI	Macronix Inc
+MXL	Hitachi Maxell, Ltd.
+MXP	Maxpeed Corporation
+MXT	Maxtech Corporation
+MXV	MaxVision Corporation
+MYA	Monydata
+MYR	Myriad Solutions Ltd
+MYX	Micronyx Inc
+NAC	Ncast Corporation
+NAD	NAD Electronics
+NAL	Network Alchemy
+NAV	Navigation Corporation
+NAX	Naxos Tecnologia
+NBL	N*Able Technologies Inc
+NBS	National Key Lab. on ISN
+NBT	NingBo Bestwinning Technology CO., Ltd
+NCA	Nixdorf Company
+NCC	NCR Corporation
+NCE	Norcent Technology, Inc.
+NCI	NewCom Inc
+NCL	NetComm Ltd
+NCR	NCR Electronics
+NCS	Northgate Computer Systems
+NCT	NEC CustomTechnica, Ltd.
+NDC	National DataComm Corporaiton
+NDI	National Display Systems
+NDK	Naitoh Densei CO., LTD.
+NDL	Network Designers
+NDS	Nokia Data
+NEC	NEC Corporation
+NEO	NEO TELECOM CO.,LTD.
+NET	Mettler Toledo
+NEU	NEUROTEC - EMPRESA DE PESQUISA E DESENVOLVIMENTO EM BIOMEDICINA
+NEX	Nexgen Mediatech Inc.,
+NFC	BTC Korea Co., Ltd
+NFS	Number Five Software
+NGC	Network General
+NGS	A D S Exports
+NHT	Vinci Labs
+NIC	National Instruments Corporation
+NIS	Nissei Electric Company
+NIT	Network Info Technology
+NIX	Seanix Technology Inc
+NLC	Next Level Communications
+NMP	Nokia Mobile Phones
+NMS	Natural Micro System
+NMV	NEC-Mitsubishi Electric Visual Systems Corporation
+NMX	Neomagic
+NNC	NNC
+NOK	Nokia Display Products
+NOR	Norand Corporation
+NOT	Not Limited Inc
+NPI	Network Peripherals Inc
+NRL	U.S. Naval Research Lab
+NRT	Beijing Northern Radiantelecom Co.
+NRV	Taugagreining hf
+NSC	National Semiconductor Corporation
+NSI	NISSEI ELECTRIC CO.,LTD
+NSP	Nspire System Inc.
+NSS	Newport Systems Solutions
+NST	Network Security Technology Co
+NTC	NeoTech S.R.L
+NTI	New Tech Int'l Company
+NTL	National Transcomm. Ltd
+NTN	Nuvoton Technology Corporation
+NTR	N-trig Innovative Technologies, Inc.
+NTS	Nits Technology Inc.
+NTT	NTT Advanced Technology Corporation
+NTW	Networth Inc
+NTX	Netaccess Inc
+NUG	NU Technology, Inc.
+NUI	NU Inc.
+NVC	NetVision Corporation
+NVD	Nvidia
+NVI	NuVision US, Inc.
+NVL	Novell Inc
+NVT	Navatek Engineering Corporation
+NWC	NW Computer Engineering
+NWP	NovaWeb Technologies Inc
+NWS	Newisys, Inc.
+NXC	NextCom K.K.
+NXG	Nexgen
+NXP	NXP Semiconductors bv.
+NXQ	Nexiq Technologies, Inc.
+NXS	Technology Nexus Secure Open Systems AB
+NYC	nakayo telecommunications,inc.
+OAK	Oak Tech Inc
+OAS	Oasys Technology Company
+OCD	Macraigor Systems Inc
+OCN	Olfan
+OCS	Open Connect Solutions
+ODM	ODME Inc.
+ODR	Odrac
+OEC	ORION ELECTRIC CO.,LTD
+OIC	Option Industrial Computers
+OIM	Option International
+OIN	Option International
+OKI	OKI Electric Industrial Company Ltd
+OLC	Olicom A/S
+OLD	Olidata S.p.A.
+OLI	Olivetti
+OLT	Olitec S.A.
+OLV	Olitec S.A.
+OLY	OLYMPUS CORPORATION
+OMC	OBJIX Multimedia Corporation
+OMN	Omnitel
+OMR	Omron Corporation
+ONE	Oneac Corporation
+ONK	ONKYO Corporation
+ONS	On Systems Inc
+ONW	OPEN Networks Ltd
+ONX	SOMELEC Z.I. Du Vert Galanta
+OOS	OSRAM
+OPC	Opcode Inc
+OPI	D.N.S. Corporation
+OPT	OPTi Inc
+OPV	Optivision Inc
+OQI	Oksori Company Ltd
+ORG	ORGA Kartensysteme GmbH
+ORI	OSR Open Systems Resources, Inc.
+ORN	ORION ELECTRIC CO., LTD.
+OSA	OSAKA Micro Computer, Inc.
+OSP	OPTI-UPS Corporation
+OSR	Oksori Company Ltd
+OTI	Orchid Technology
+OTT	OPTO22, Inc.
+OUK	OUK Company Ltd
+OWL	Mediacom Technologies Pte Ltd
+OXU	Oxus Research S.A.
+OYO	Shadow Systems
+OZO	Tribe Computer Works Inc
+PAC	Pacific Avionics Corporation
+PAD	Promotion and Display Technology Ltd.
+PAK	Many CNC System Co., Ltd.
+PAM	Peter Antesberger Messtechnik
+PAN	The Panda Project
+PAR	Parallan Comp Inc
+PBI	Pitney Bowes
+PBL	Packard Bell Electronics
+PBN	Packard Bell NEC
+PBV	Pitney Bowes
+PCA	Philips BU Add On Card
+PCB	OCTAL S.A.
+PCC	PowerCom Technology Company Ltd
+PCG	First Industrial Computer Inc
+PCI	Pioneer Computer Inc
+PCK	PCBANK21
+PCL	pentel.co.,ltd
+PCM	PCM Systems Corporation
+PCO	Performance Concepts Inc.,
+PCP	Procomp USA Inc
+PCT	PC-Tel Inc
+PCW	Pacific CommWare Inc
+PCX	PC Xperten
+PDM	Psion Dacom Plc.
+PDN	AT&T Paradyne
+PDR	Pure Data Inc
+PDS	PD Systems International Ltd
+PDT	PDTS - Prozessdatentechnik und Systeme
+PDV	Prodrive B.V.
+PEC	POTRANS Electrical Corp.
+PEI	PEI Electronics Inc
+PEL	Primax Electric Ltd
+PEN	Interactive Computer Products Inc
+PEP	Peppercon AG
+PER	Perceptive Signal Technologies
+PET	Practical Electronic Tools
+PFT	Telia ProSoft AB
+PGM	Paradigm Advanced Research Centre
+PGP	propagamma kommunikation
+PGS	Princeton Graphic Systems
+PHC	Pijnenburg Beheer N.V.
+PHI	DO NOT USE - PHI
+PHL	Philips Consumer Electronics Company
+PHO	Photonics Systems Inc.
+PHS	Philips Communication Systems
+PHY	Phylon Communications
+PIE	Pacific Image Electronics Company Ltd
+PIM	Prism, LLC
+PIO	Pioneer Electronic Corporation
+PIX	Pixie Tech Inc
+PJA	Projecta
+PJD	Projectiondesign AS
+PJT	Pan Jit International Inc.
+PKA	Acco UK ltd.
+PLC	Pro-Log Corporation
+PLM	PROLINK Microsystems Corp.
+PLV	PLUS Vision Corp.
+PLX	Parallax Graphics
+PLY	Polycom Inc.
+PMC	PMC Consumer Electronics Ltd
+PMD	TDK USA Corporation
+PMM	Point Multimedia System
+PMT	Promate Electronic Co., Ltd.
+PMX	Photomatrix
+PNG	Microsoft
+PNG	P.I. Engineering Inc
+PNL	Panelview, Inc.
+PNP	Microsoft
+PNR	Planar Systems, Inc.
+PNS	PanaScope
+PNX	Phoenix Technologies, Ltd.
+POL	PolyComp (PTY) Ltd.
+PON	Perpetual Technologies, LLC
+POR	Portalis LC
+PPC	Phoenixtec Power Company Ltd
+PPD	MEPhI
+PPI	Practical Peripherals
+PPM	Clinton Electronics Corp.
+PPP	Purup Prepress AS
+PPR	PicPro
+PRA	PRO/AUTOMATION
+PRC	PerComm
+PRD	Praim S.R.L.
+PRF	Digital Electronics Corporation
+PRG	The Phoenix Research Group Inc
+PRI	Priva Hortimation BV
+PRM	Prometheus
+PRO	Proteon
+PRS	Leutron Vision
+PRX	Proxima Corporation
+PSA	Advanced Signal Processing Technologies
+PSC	Philips Semiconductors
+PSD	Peus-Systems GmbH
+PSE	Practical Solutions Pte., Ltd.
+PSI	PSI-Perceptive Solutions Inc
+PSL	Perle Systems Limited
+PSM	Prosum
+PST	Global Data SA
+PTC	PS Technology Corporation
+PTG	Cipher Systems Inc
+PTH	Pathlight Technology Inc
+PTI	Promise Technology Inc
+PTL	Pantel Inc
+PTS	Plain Tree Systems Inc
+PVG	Proview Global Co., Ltd
+PVN	Pixel Vision
+PVP	Klos Technologies, Inc.
+PXC	Phoenix Contact
+PXE	PIXELA CORPORATION
+PXL	The Moving Pixel Company
+PXM	Proxim Inc
+QCC	QuakeCom Company Ltd
+QCH	Metronics Inc
+QCI	Quanta Computer Inc
+QCK	Quick Corporation
+QCL	Quadrant Components Inc
+QCP	Qualcomm Inc
+QDI	Quantum Data Incorporated
+QDM	Quadram
+QDS	Quanta Display Inc.
+QFF	Padix Co., Inc.
+QFI	Quickflex, Inc
+QLC	Q-Logic
+QQQ	Chuomusen Co., Ltd.
+QSI	Quantum Solutions, Inc.
+QTD	Quantum 3D Inc
+QTH	Questech Ltd
+QTI	Quicknet Technologies Inc
+QTM	Quantum
+QTR	Qtronix Corporation
+QUA	Quatographic AG
+QUE	Questra Consulting
+RAC	Racore Computer Products Inc
+RAD	Radisys Corporation
+RAI	Rockwell Automation/Intecolor
+RAN	Rancho Tech Inc
+RAR	Raritan, Inc.
+RAS	RAScom Inc
+RAT	Rent-A-Tech
+RAY	Raylar Design, Inc.
+RCE	Parc d'Activite des Bellevues
+RCH	Reach Technology Inc
+RCI	RC International
+RCN	Radio Consult SRL
+RDI	Rainbow Displays, Inc.
+RDM	Tremon Enterprises Company Ltd
+RDS	Radius Inc
+REA	Real D
+REC	ReCom
+RED	Research Electronics Development Inc
+REF	Reflectivity, Inc.
+REL	Reliance Electric Ind Corporation
+REM	SCI Systems Inc.
+REN	Renesas Technology Corp.
+RES	ResMed Pty Ltd
+RGL	Robertson Geologging Ltd
+RHM	Rohm Company Ltd
+RII	Racal Interlan Inc
+RIO	Rios Systems Company Ltd
+RIT	Ritech Inc
+RIV	Rivulet Communications
+RJA	Roland Corporation
+RJS	Advanced Engineering
+RKC	Reakin Technolohy Corporation
+RLD	MEPCO
+RLN	RadioLAN Inc
+RMC	Raritan Computer, Inc
+RMP	Research Machines
+RNB	Rainbow Technologies
+ROB	Robust Electronics GmbH
+ROH	Rohm Co., Ltd.
+ROK	Rockwell International
+ROP	Roper International Ltd
+RPT	R.P.T.Intergroups
+RRI	Radicom Research Inc
+RSC	PhotoTelesis
+RSH	ADC-Centre
+RSI	Rampage Systems Inc
+RSN	Radiospire Networks, Inc.
+RSQ	R Squared
+RSS	Rockwell Semiconductor Systems
+RSX	Rapid Tech Corporation
+RTC	Relia Technologies
+RTI	Rancho Tech Inc
+RTL	Realtek Semiconductor Company Ltd
+RTS	Raintree Systems
+RUN	RUNCO International
+RUP	Ups Manufactoring s.r.l.
+RVC	RSI Systems Inc
+RVI	Realvision Inc
+RVL	Reveal Computer Prod
+RWC	Red Wing Corporation
+RXT	Tectona SoftSolutions (P) Ltd.,
+SAA	Sanritz Automation Co.,Ltd.
+SAE	Saab Aerotech
+SAG	Sedlbauer
+SAI	Sage Inc
+SAK	Saitek Ltd
+SAM	Samsung Electric Company
+SAN	Sanyo Electric Co.,Ltd.
+SAS	Stores Automated Systems Inc
+SAT	Shuttle Tech
+SBC	Shanghai Bell Telephone Equip Mfg Co
+SBD	Softbed - Consulting & Development Ltd
+SBI	SMART Technologies Inc.
+SBS	SBS-or Industrial Computers GmbH
+SBT	Senseboard Technologies AB
+SCC	SORD Computer Corporation
+SCD	Sanyo Electric Company Ltd
+SCE	Sun Corporation
+SCH	Schlumberger Cards
+SCI	System Craft
+SCL	Sigmacom Co., Ltd.
+SCM	SCM Microsystems Inc
+SCN	Scanport, Inc.
+SCO	SORCUS Computer GmbH
+SCP	Scriptel Corporation
+SCR	Systran Corporation
+SCS	Nanomach Anstalt
+SCT	Smart Card Technology
+SDA	SAT (Societe Anonyme)
+SDD	Intrada-SDD Ltd
+SDE	Sherwood Digital Electronics Corporation
+SDF	SODIFF E&T CO., Ltd.
+SDH	Communications Specialies, Inc.
+SDI	Samtron Displays Inc
+SDK	SAIT-Devlonics
+SDR	SDR Systems
+SDS	SunRiver Data System
+SDT	Siemens AG
+SDX	SDX Business Systems Ltd
+SEA	Seanix Technology Inc.
+SEB	system elektronik GmbH
+SEC	Seiko Epson Corporation
+SEE	SeeColor Corporation
+SEI	Seitz & Associates Inc
+SEL	Way2Call Communications
+SEM	Samsung Electronics Company Ltd
+SEN	Sencore
+SEO	SEOS Ltd
+SEP	SEP Eletronica Ltda.
+SER	Sony Ericsson Mobile Communications Inc.
+SET	SendTek Corporation
+SFM	TORNADO Company
+SFT	Mikroforum Ring 3
+SGC	Spectragraphics Corporation
+SGD	Sigma Designs, Inc.
+SGE	Kansai Electric Company Ltd
+SGI	Scan Group Ltd
+SGL	Super Gate Technology Company Ltd
+SGM	SAGEM
+SGO	Logos Design A/S
+SGT	Stargate Technology
+SGX	Silicon Graphics Inc
+SGZ	Systec Computer GmbH
+SHC	ShibaSoku Co., Ltd.
+SHG	Soft & Hardware development Goldammer GmbH
+SHI	Jiangsu Shinco Electronic Group Co., Ltd
+SHP	Sharp Corporation
+SHR	Digital Discovery
+SHT	Shin Ho Tech
+SIA	SIEMENS AG
+SIB	Sanyo Electric Company Ltd
+SIC	Sysmate Corporation
+SID	Seiko Instruments Information Devices Inc
+SIE	Siemens
+SIG	Sigma Designs Inc
+SII	Silicon Image, Inc.
+SIL	Silicon Laboratories, Inc
+SIM	S3 Inc
+SIN	Singular Technology Co., Ltd.
+SIR	Sirius Technologies Pty Ltd
+SIS	Silicon Integrated Systems Corporation
+SIT	Sitintel
+SIU	Seiko Instruments USA Inc
+SIX	Zuniq Data Corporation
+SJE	Sejin Electron Inc
+SKD	Schneider & Koch
+SKT	Samsung Electro-Mechanics Company Ltd
+SKY	SKYDATA S.P.A.
+SLA	Systeme Lauer GmbH&Co KG
+SLB	Shlumberger Ltd
+SLC	Syslogic Datentechnik AG
+SLH	Silicon Library Inc.
+SLI	Symbios Logic Inc
+SLK	Silitek Corporation
+SLM	Solomon Technology Corporation
+SLR	Schlumberger Technology Corporate
+SLT	Salt Internatioinal Corp.
+SLX	Specialix
+SMA	SMART Modular Technologies
+SMB	Schlumberger
+SMC	Standard Microsystems Corporation
+SME	Sysmate Company
+SMI	SpaceLabs Medical Inc
+SMK	SMK CORPORATION
+SML	Sumitomo Metal Industries, Ltd.
+SMM	Shark Multimedia Inc
+SMO	STMicroelectronics
+SMP	Simple Computing
+SMR	B.& V. s.r.l.
+SMS	Silicom Multimedia Systems Inc
+SMT	Silcom Manufacturing Tech Inc
+SNC	Sentronic International Corp.
+SNI	Siemens Microdesign GmbH
+SNK	S&K Electronics
+SNO	SINOSUN TECHNOLOGY CO., LTD
+SNP	Siemens Nixdorf Info Systems
+SNS	Cirtech (UK) Ltd
+SNT	SuperNet Inc
+SNW	Snell & Wilcox
+SNX	Sonix Comm. Ltd
+SNY	Sony
+SOI	Silicon Optix Corporation
+SOL	Solitron Technologies Inc
+SON	Sony
+SOR	Sorcus Computer GmbH
+SOT	Sotec Company Ltd
+SOY	SOYO Group, Inc
+SPC	SpinCore Technologies, Inc
+SPE	SPEA Software AG
+SPH	G&W Instruments GmbH
+SPI	SPACE-I Co., Ltd.
+SPL	Smart Silicon Systems Pty Ltd
+SPN	Sapience Corporation
+SPR	pmns GmbH
+SPS	Synopsys Inc
+SPT	Sceptre Tech Inc
+SPU	SIM2 Multimedia S.P.A.
+SPX	Simplex Time Recorder Co.
+SQT	Sequent Computer Systems Inc
+SRC	Integrated Tech Express Inc
+SRD	Setred
+SRF	Surf Communication Solutions Ltd
+SRG	Intuitive Surgical, Inc.
+SRT	SeeReal Technologies GmbH
+SSC	Sierra Semiconductor Inc
+SSD	FlightSafety International
+SSE	Samsung Electronic Co.
+SSI	S-S Technology Inc
+SSJ	Sankyo Seiki Mfg.co., Ltd
+SSP	Spectrum Signal Proecessing Inc
+SSS	S3 Inc
+SST	SystemSoft Corporation
+STA	ST Electronics Systems Assembly Pte Ltd
+STB	STB Systems Inc
+STC	STAC Electronics
+STD	STD Computer Inc
+STE	SII Ido-Tsushin Inc
+STF	Starflight Electronics
+STG	StereoGraphics Corp.
+STH	Semtech Corporation
+STI	Smart Tech Inc
+STK	SANTAK CORP.
+STL	SigmaTel Inc
+STM	SGS Thomson Microelectronics
+STN	Samsung Electronics America
+STO	Stollmann E+V GmbH
+STP	StreamPlay Ltd
+STR	Starlight Networks Inc
+STS	SITECSYSTEM CO., LTD.
+STT	Star Paging Telecom Tech (Shenzhen) Co. Ltd.
+STW	Starwin Inc.
+STY	SDS Technologies
+SUB	Subspace Comm. Inc
+SUM	Summagraphics Corporation
+SUN	Sun Electronics Corporation
+SUP	Supra Corporation
+SUR	Surenam Computer Corporation
+SVA	SGEG
+SVC	Intellix Corp.
+SVD	SVD Computer
+SVI	Sun Microsystems
+SVS	SVSI
+SVT	SEVIT Co., Ltd.
+SWC	Software Café
+SWI	Sierra Wireless Inc.
+SWL	Sharedware Ltd
+SWS	Static
+SWT	Software Technologies Group,Inc.
+SXB	Syntax-Brillian
+SXD	Silex technology, Inc.
+SXL	SolutionInside
+SYC	Sysmic
+SYK	Stryker Communications
+SYL	Sylvania Computer Products
+SYM	Symicron Computer Communications Ltd.
+SYN	Synaptics Inc
+SYP	SYPRO Co Ltd
+SYS	Sysgration Ltd
+SYT	Seyeon Tech Company Ltd
+SYV	SYVAX Inc
+SYX	Prime Systems, Inc.
+TAA	Tandberg
+TAB	Todos Data System AB
+TAG	Teles AG
+TAI	Toshiba America Info Systems Inc
+TAM	Tamura Seisakusyo Ltd
+TAS	Taskit Rechnertechnik GmbH
+TAT	Teleliaison Inc
+TAX	Taxan (Europe) Ltd
+TBB	Triple S Engineering Inc
+TBC	Turbo Communication, Inc
+TBS	Turtle Beach System
+TCC	Tandon Corporation
+TCD	Taicom Data Systems Co., Ltd.
+TCE	Century Corporation
+TCH	Interaction Systems, Inc
+TCI	Tulip Computers Int'l B.V.
+TCJ	TEAC America Inc
+TCL	Technical Concepts Ltd
+TCM	3Com Corporation
+TCN	Tecnetics (PTY) Ltd
+TCO	Thomas-Conrad Corporation
+TCR	Thomson Consumer Electronics
+TCS	Tatung Company of America Inc
+TCT	Telecom Technology Centre Co. Ltd.
+TCX	FREEMARS Heavy Industries
+TDC	Teradici
+TDD	Tandberg Data Display AS
+TDK	TDK USA Corporation
+TDM	Tandem Computer Europe Inc
+TDP	3D Perception
+TDS	Tri-Data Systems Inc
+TDT	TDT
+TDV	TDVision Systems, Inc.
+TDY	Tandy Electronics
+TEA	TEAC System Corporation
+TEC	Tecmar Inc
+TEK	Tektronix Inc
+TEL	Promotion and Display Technology Ltd.
+TER	TerraTec Electronic GmbH
+TGI	TriGem Computer Inc
+TGM	TriGem Computer,Inc.
+TGS	Torus Systems Ltd
+TGV	Grass Valley Germany GmbH
+THN	Thundercom Holdings Sdn. Bhd.
+TIC	Trigem KinfoComm
+TIP	TIPTEL AG
+TIV	OOO Technoinvest
+TIX	Tixi.Com GmbH
+TKC	Taiko Electric Works.LTD
+TKN	Teknor Microsystem Inc
+TKO	TouchKo, Inc.
+TKS	TimeKeeping Systems, Inc.
+TLA	Ferrari Electronic GmbH
+TLD	Telindus
+TLI	TOSHIBA TELI CORPORATION
+TLK	Telelink AG
+TLS	Teleste Educational OY
+TLT	Dai Telecom S.p.A.
+TLV	S3 Inc
+TLX	Telxon Corporation
+TMC	Techmedia Computer Systems Corporation
+TME	AT&T Microelectronics
+TMI	Texas Microsystem
+TMM	Time Management, Inc.
+TMR	Taicom International Inc
+TMS	Trident Microsystems Ltd
+TMT	T-Metrics Inc.
+TMX	Thermotrex Corporation
+TNC	TNC Industrial Company Ltd
+TNM	TECNIMAGEN SA
+TNY	Tennyson Tech Pty Ltd
+TOE	TOEI Electronics Co., Ltd.
+TOG	The OPEN Group
+TOP	Orion Communications Co., Ltd.
+TOS	Toshiba Corporation
+TOU	Touchstone Technology
+TPC	Touch Panel Systems Corporation
+TPE	Technology Power Enterprises Inc
+TPJ	(none)
+TPK	TOPRE CORPORATION
+TPR	Topro Technology Inc
+TPS	Teleprocessing Systeme GmbH
+TPV	Top Victory Electronics ( Fujian ) Company Ltd
+TPZ	Ypoaz Systems Inc
+TRA	TriTech Microelectronics International
+TRC	Trioc AB
+TRD	Trident Microsystem Inc
+TRE	Tremetrics
+TRI	Tricord Systems
+TRL	Royal Information
+TRM	Tekram Technology Company Ltd
+TRN	Datacommunicatie Tron B.V.
+TRS	Torus Systems Ltd
+TRU	Aashima Technology B.V.
+TRX	Trex Enterprises
+TSB	Toshiba America Info Systems Inc
+TSC	Sanyo Electric Company Ltd
+TSD	TechniSat Digital GmbH
+TSE	Tottori Sanyo Electric
+TSF	Racal-Airtech Software Forge Ltd
+TSG	The Software Group Ltd
+TSI	TeleVideo Systems
+TSL	Tottori SANYO Electric Co., Ltd.
+TSP	U.S. Navy
+TST	Transtream Inc
+TSY	TouchSystems
+TTA	Topson Technology Co., Ltd.
+TTB	National Semiconductor Japan Ltd
+TTC	Telecommunications Techniques Corporation
+TTE	TTE, Inc.
+TTI	Trenton Terminals Inc
+TTK	Totoku Electric Company Ltd
+TTL	2-Tel B.V.
+TTS	TechnoTrend Systemtechnik GmbH
+TUT	Tut Systems
+TVD	Tecnovision
+TVI	Truevision
+TVM	Taiwan Video & Monitor Corporation
+TVO	TV One Ltd
+TVR	TV Interactive Corporation
+TVS	TVS Electronics Limited
+TWA	Tidewater Association
+TWE	Kontron Electronik
+TWH	Twinhead International Corporation
+TWI	Easytel oy
+TWK	TOWITOKO electronics GmbH
+TXL	Trixel Ltd
+TXN	Texas Insturments
+TXT	Textron Defense System
+TYN	Tyan Computer Corporation
+UAS	Ultima Associates Pte Ltd
+UBI	Ungermann-Bass Inc
+UBL	Ubinetics Ltd.
+UDN	Uniden Corporation
+UEC	Ultima Electronics Corporation
+UEG	Elitegroup Computer Systems Company Ltd
+UEI	Universal Electronics Inc
+UET	Universal Empowering Technologies
+UFG	UNIGRAF-USA
+UFO	UFO Systems Inc
+UHB	XOCECO
+UIC	Uniform Industrial Corporation
+UJR	Ueda Japan Radio Co., Ltd.
+ULT	Ultra Network Tech
+UMC	United Microelectr Corporation
+UMG	Umezawa Giken Co.,Ltd
+UMM	Universal Multimedia
+UNA	Unisys DSD
+UNB	Unisys Corporation
+UNC	Unisys Corporation
+UND	Unisys Corporation
+UNE	Unisys Corporation
+UNF	Unisys Corporation
+UNI	Uniform Industry Corp.
+UNI	Unisys Corporation
+UNM	Unisys Corporation
+UNO	Unisys Corporation
+UNP	Unitop
+UNS	Unisys Corporation
+UNT	Unisys Corporation
+UNY	Unicate
+UPP	UPPI
+UPS	Systems Enhancement
+URD	Video Computer S.p.A.
+USA	Utimaco Safeware AG
+USD	U.S. Digital Corporation
+USI	Universal Scientific Industrial Co., Ltd.
+USR	U.S. Robotics Inc
+UTD	Up to Date Tech
+UWC	Uniwill Computer Corp.
+VAL	Valence Computing Corporation
+VAR	Varian Australia Pty Ltd
+VBT	Valley Board Ltda
+VCC	Virtual Computer Corporation
+VCI	VistaCom Inc
+VCJ	Victor Company of Japan, Limited
+VCM	Vector Magnetics, LLC
+VCX	VCONEX
+VDA	Victor Data Systems
+VDM	Vadem
+VDO	Video & Display Oriented Corporation
+VDS	Vidisys GmbH & Company
+VDT	Viditec, Inc.
+VEC	Vector Informatik GmbH
+VEK	Vektrex
+VES	Vestel Elektronik Sanayi ve Ticaret A. S.
+VFI	VeriFone Inc
+VHI	Macrocad Development Inc.
+VIA	VIA Tech Inc
+VIB	Tatung UK Ltd
+VIC	Victron B.V.
+VID	Ingram Macrotron Germany
+VIK	Viking Connectors
+VIN	Vine Micros Ltd
+VIR	Visual Interface, Inc
+VIS	Visioneer
+VIT	Visitech AS
+VLB	ValleyBoard Ltda.
+VLT	VideoLan Technologies
+VMI	Vermont Microsystems
+VML	Vine Micros Limited
+VNC	Vinca Corporation
+VOB	MaxData Computer AG
+VPR	Best Buy
+VRC	Virtual Resources Corporation
+VSC	ViewSonic Corporation
+VSD	3M
+VSI	VideoServer
+VSN	Ingram Macrotron
+VSP	Vision Systems GmbH
+VSR	V-Star Electronics Inc.
+VTC	VTel Corporation
+VTG	Voice Technologies Group Inc
+VTI	VLSI Tech Inc
+VTK	Viewteck Co., Ltd.
+VTL	Vivid Technology Pte Ltd
+VTS	VTech Computers Ltd
+VTV	VATIV Technologies
+VUT	Vutrix (UK) Ltd
+VWB	Vweb Corp.
+WAC	Wacom Tech
+WAL	Wave Access
+WAV	Wavephore
+WBN	MicroSoftWare
+WBS	WB Systemtechnik GmbH
+WCI	Wisecom Inc
+WCS	Woodwind Communications Systems Inc
+WDC	Western Digital
+WDE	Westinghouse Digital Electronics
+WEB	WebGear Inc
+WEC	Winbond Electronics Corporation
+WEY	WEY Design AG
+WHI	Whistle Communications
+WII	Innoware Inc
+WIL	WIPRO Information Technology Ltd
+WIN	Wintop Technology Inc
+WIP	Wipro Infotech
+WKH	Uni-Take Int'l Inc.
+WLD	Wildfire Communications Inc
+WML	Wolfson Microelectronics Ltd
+WMO	Westermo Teleindustri AB
+WMT	Winmate Communication Inc
+WNI	WillNet Inc.
+WNV	Winnov L.P.
+WNX	Wincor Nixdorf International GmbH
+WPA	Matsushita Communication Industrial Co., Ltd.
+WPI	Wearnes Peripherals International (Pte) Ltd
+WRC	WiNRADiO Communications
+WSC	CIS Technology Inc
+WSP	Wireless And Smart Products Inc.
+WTC	ACC Microelectronics
+WTI	WorkStation Tech
+WTK	Wearnes Thakral Pte
+WTS	Restek Electric Company Ltd
+WVM	Wave Systems Corporation
+WWV	World Wide Video, Inc.
+WYS	Wyse Technology
+WYT	Wooyoung Image & Information Co.,Ltd.
+XAC	XAC Automation Corp
+XFG	Jan Strapko - FOTO
+XFO	EXFO Electro Optical Engineering
+XIN	Xinex Networks Inc
+XIO	Xiotech Corporation
+XIR	Xirocm Inc
+XIT	Xitel Pty ltd
+XLX	Xilinx, Inc.
+XMM	C3PO S.L.
+XNT	XN Technologies, Inc.
+XQU	SHANGHAI SVA-DAV ELECTRONICS CO., LTD
+XRC	Xircom Inc
+XRO	XORO ELECTRONICS (CHENGDU) LIMITED
+XSN	Xscreen AS
+XST	XS Technologies Inc
+XSY	XSYS
+XTD	Icuiti Corporation
+XTL	Crystal Computer
+XTN	X-10 (USA) Inc
+XYC	Xycotec Computer GmbH
+YED	Y-E Data Inc
+YHQ	Yokogawa Electric Corporation
+YHW	Exacom SA
+YMH	Yamaha Corporation
+YOW	American Biometric Company
+ZAN	Zandar Technologies plc
+ZAX	Zefiro Acoustics
+ZAZ	Zazzle Technologies
+ZBR	Zebra Technologies International, LLC
+ZCT	ZeitControl cardsystems GmbH
+ZDS	Zenith Data Systems
+ZGT	Zenith Data Systems
+ZIC	ZTEIC DESIGN CO., LTD.
+ZMT	Zalman Tech Co., Ltd.
+ZMZ	Z Microsystems
+ZNI	Zetinet Inc
+ZNX	Znyx Adv. Systems
+ZOW	Zowie Intertainment, Inc
+ZRN	Zoran Corporation
+ZSE	Zenith Data Systems
+ZTC	ZyDAS Technology Corporation
+ZTI	Zoom Telephonics Inc
+ZTM	ZT Group Int'l Inc.
+ZYD	Zydacron Inc
+ZYP	Zypcom Inc
+ZYT	Zytex Computers
+ZYX	Zyxel
+ZZZ	Boca Research Inc

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.1.ebuild
similarity index 95%
rename from gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.6.1.ebuild
index 3e135ce..50e9622 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.6.0.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.6.1.ebuild
@@ -57,19 +57,6 @@ fi
 # Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
 # eventually libXrandr shouldn't RDEPEND on randrproto)
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
-	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-gnome-distributor=Gentoo
-		$(use_enable doc desktop-docs)
-		$(use_enable introspection)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-}
-
 src_unpack() {
 	gnome2_src_unpack
 
@@ -92,6 +79,24 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
+	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
+	G2CONF="${G2CONF}
+		--disable-static
+		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
+		$(use_enable introspection)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+
+	# FIXME: the tarball provides an empty file
+	cp "${FILESDIR}"/pnp.ids.r1 "${S}"/libgnome-desktop/pnp.ids || die
+
+	gnome2_src_prepare
+}
+
 pkg_preinst() {
 	gnome2_pkg_preinst
 	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-3.so.2

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
index 604519f..4ef2283 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild
@@ -57,19 +57,6 @@ fi
 # Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
 # eventually libXrandr shouldn't RDEPEND on randrproto)
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
-	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
-	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-gnome-distributor=Gentoo
-		$(use_enable doc desktop-docs)
-		$(use_enable introspection)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-}
-
 src_unpack() {
 	gnome2_src_unpack
 
@@ -91,3 +78,17 @@ src_unpack() {
 			die "ln -sf failed"
 	fi
 }
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	# Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids
+	# file (needed by other packages such as >=gnome-settings-daemon-3.1.2)
+	# will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0).
+	G2CONF="${G2CONF}
+		--disable-static
+		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
+		$(use_enable introspection)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_prepare
+}
\ No newline at end of file


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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2011-10-18  7:37 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     5a53ffb7985e69510ee0d21ac5f652e87db79ae7
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 23:20:12 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 17 23:20:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5a53ffb7

gnome-base/gnome-desktop: 3.2.0 → 3.2.1

Bump. Patches were applied upstream.

---
 ...ome-desktop-3.2.0-GnomeWallClock-fallback.patch |   47 --------
 ...esktop-3.2.0-dpmssettimeouts-return-value.patch |   91 ---------------
 ...3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch |  116 --------------------
 ...-3.2.0-r2.ebuild => gnome-desktop-3.2.1.ebuild} |   16 +---
 4 files changed, 1 insertions(+), 269 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch
deleted file mode 100644
index 82b59c5..0000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 311476792ba7948f0eba5e4d9a1328cf3ff18950 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Mon, 3 Oct 2011 16:35:20 -0400
-Subject: [PATCH 2/2] GnomeWallClock: Fix non-Linux fallback code
-
-This fixes the "infinite loop in gnome-screensaver" bug.  Only
-dispatch in cancel on set when the monotonic timeout has expired,
-otherwise we will drop into a tight loop.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660343
----
- libgnome-desktop/gnome-datetime-source.c |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-datetime-source.c b/libgnome-desktop/gnome-datetime-source.c
-index 05ec80a..a35d5b3 100644
---- a/libgnome-desktop/gnome-datetime-source.c
-+++ b/libgnome-desktop/gnome-datetime-source.c
-@@ -57,8 +57,10 @@ static gboolean
- g_datetime_source_is_expired (GDateTimeSource *datetime_source)
- {
- 	gint64 real_now;
-+	gint64 monotonic_now;
- 
- 	real_now = g_get_real_time ();
-+	monotonic_now = g_source_get_time ((GSource*)datetime_source);
- 
- 	if (datetime_source->initially_expired)
- 		return TRUE;
-@@ -66,10 +68,11 @@ g_datetime_source_is_expired (GDateTimeSource *datetime_source)
- 	if (datetime_source->real_expiration <= real_now)
- 		return TRUE;
- 
--	/* We can't really detect without system support when things change;
--	 * so just trigger every second.
-+	/* We can't really detect without system support when things
-+	 * change; so just trigger every second (i.e. our wakeup
-+	 * expiration)
- 	 */
--	if (datetime_source->cancel_on_set)
-+	if (datetime_source->cancel_on_set && monotonic_now >= datetime_source->wakeup_expiration)
- 		return TRUE;
- 
- 	return FALSE;
--- 
-1.7.7
-

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch
deleted file mode 100644
index cd8b401..0000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From c33e020e4b6119b08c3748209360b7c826e0dfca Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Wed, 5 Oct 2011 02:27:48 -0400
-Subject: [PATCH] Ignore DPMSSetTimeouts() and DPMSForceLevel() return value
-
-At least with nvidia binary drivers, DPMSSetTimeouts() and DPMSForceLevel()
-always return BadRequest, even if they succeed. On a machine with intel
-graphics, DPMSForceLevel() was also observed to return BadRequest despite
-successfully changing the DPMS level. So we should just ignore the return
-value from these functions, like xset does.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660962
----
- libgnome-desktop/gnome-rr.c |   34 +++++++++++-----------------------
- 1 files changed, 11 insertions(+), 23 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index 465dee9..55ca03b 100644
---- a/libgnome-desktop/gnome-rr.c
-+++ b/libgnome-desktop/gnome-rr.c
-@@ -1240,24 +1240,17 @@ static gboolean
- gnome_rr_screen_clear_dpms_timeouts (GnomeRRScreen *screen,
-                                      GError **error)
- {
--    gboolean ret = TRUE;
--    gint rc;
--
-     gdk_error_trap_push ();
--    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
--    if (gdk_error_trap_pop ())
--        ret = FALSE;
--
--    if (!ret || rc != Success) {
--        ret = FALSE;
-+    /* DPMSSetTimeouts() return value is often a lie, so ignore it */
-+    DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
-+    if (gdk_error_trap_pop ()) {
-         g_set_error_literal (error,
-                              GNOME_RR_ERROR,
-                              GNOME_RR_ERROR_UNKNOWN,
-                              "Could not set DPMS timeouts");
--        goto out;
-+        return FALSE;
-     }
--out:
--    return ret;
-+    return TRUE;
- }
- 
- /**
-@@ -1272,7 +1265,6 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
- {
-     CARD16 state = 0;
-     gboolean ret;
--    gint rc;
-     GnomeRRDpmsMode current_mode;
- 
-     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-@@ -1305,11 +1297,9 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
-     }
- 
-     gdk_error_trap_push ();
--    rc = DPMSForceLevel (screen->priv->xdisplay, state);
--    if (gdk_error_trap_pop ())
--        ret = FALSE;
--
--    if (!ret || rc != Success) {
-+    /* DPMSForceLevel() return value is often a lie, so ignore it */
-+    DPMSForceLevel (screen->priv->xdisplay, state);
-+    if (gdk_error_trap_pop ()) {
-         ret = FALSE;
-         g_set_error_literal (error,
-                              GNOME_RR_ERROR,
-@@ -1319,11 +1309,9 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
-     }
- 
-     gdk_error_trap_push ();
--    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
--    if (gdk_error_trap_pop ())
--        ret = FALSE;
--
--    if (!ret || rc != Success) {
-+    /* DPMSSetTimeouts() return value is often a lie, so ignore it */
-+    DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
-+    if (gdk_error_trap_pop ()) {
-         ret = FALSE;
-         g_set_error_literal (error,
-                              GNOME_RR_ERROR,
--- 
-1.7.7
-

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch
deleted file mode 100644
index 4e6d780..0000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 55daaf0972c0021a20624dcd16df5e14cca5d430 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 3 Oct 2011 16:19:23 +0100
-Subject: [PATCH 1/2] When setting the DPMS mode manually, clear the timeouts
-
-Based on a patch from Michael Vogt, many thanks.
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660482
----
- libgnome-desktop/gnome-rr.c |   57 ++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 53 insertions(+), 4 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index d5f0590..465dee9 100644
---- a/libgnome-desktop/gnome-rr.c
-+++ b/libgnome-desktop/gnome-rr.c
-@@ -1234,7 +1234,36 @@ out:
- }
- 
- /**
-+ * gnome_rr_screen_clear_dpms_timeouts:
-+ **/
-+static gboolean
-+gnome_rr_screen_clear_dpms_timeouts (GnomeRRScreen *screen,
-+                                     GError **error)
-+{
-+    gboolean ret = TRUE;
-+    gint rc;
-+
-+    gdk_error_trap_push ();
-+    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
-+    if (gdk_error_trap_pop ())
-+        ret = FALSE;
-+
-+    if (!ret || rc != Success) {
-+        ret = FALSE;
-+        g_set_error_literal (error,
-+                             GNOME_RR_ERROR,
-+                             GNOME_RR_ERROR_UNKNOWN,
-+                             "Could not set DPMS timeouts");
-+        goto out;
-+    }
-+out:
-+    return ret;
-+}
-+
-+/**
-  * gnome_rr_screen_set_dpms_mode:
-+ *
-+ * This method also disables the DPMS timeouts.
-  **/
- gboolean
- gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
-@@ -1243,6 +1272,7 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
- {
-     CARD16 state = 0;
-     gboolean ret;
-+    gint rc;
-     GnomeRRDpmsMode current_mode;
- 
-     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-@@ -1251,8 +1281,10 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
-     ret = gnome_rr_screen_get_dpms_mode (screen, &current_mode, error);
-     if (!ret)
-         goto out;
--    if (current_mode == mode)
-+    if (current_mode == mode) {
-+        ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
-         goto out;
-+    }
- 
-     switch (mode) {
-     case GNOME_RR_DPMS_ON:
-@@ -1273,12 +1305,11 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
-     }
- 
-     gdk_error_trap_push ();
--    ret = DPMSForceLevel (screen->priv->xdisplay, state);
--    gdk_flush ();
-+    rc = DPMSForceLevel (screen->priv->xdisplay, state);
-     if (gdk_error_trap_pop ())
-         ret = FALSE;
- 
--    if (!ret) {
-+    if (!ret || rc != Success) {
-         ret = FALSE;
-         g_set_error_literal (error,
-                              GNOME_RR_ERROR,
-@@ -1286,6 +1317,24 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
-                              "Could not change DPMS mode");
-         goto out;
-     }
-+
-+    gdk_error_trap_push ();
-+    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
-+    if (gdk_error_trap_pop ())
-+        ret = FALSE;
-+
-+    if (!ret || rc != Success) {
-+        ret = FALSE;
-+        g_set_error_literal (error,
-+                             GNOME_RR_ERROR,
-+                             GNOME_RR_ERROR_UNKNOWN,
-+                             "Could not set DPMS timeouts");
-+        goto out;
-+    }
-+
-+    ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
-+    if (!ret)
-+        goto out;
- out:
-     return ret;
- }
--- 
-1.7.7
-

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild
similarity index 83%
rename from gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild
index 3b01e21..300f0d8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit git-2 gnome2-live
 fi
@@ -85,17 +85,3 @@ src_unpack() {
 			die "ln -sf failed"
 	fi
 }
-
-src_prepare() {
-	# Useful upstream patches, will be in next release
-	# Clear DPMS timeouts, bug #385063
-	epatch "${FILESDIR}/${P}-gnome_rr_screen_clear_dpms_timeouts.patch"
-	# Fix GNomeWallClock fallback code
-	epatch "${FILESDIR}/${P}-GnomeWallClock-fallback.patch"
-
-	# Required for setting DPMS timeouts and modes to work on some hardware;
-	# https://bugzilla.gnome.org/show_bug.cgi?id=660962
-	epatch "${FILESDIR}/${P}-dpmssettimeouts-return-value.patch"
-
-	gnome2_src_prepare
-}



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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2011-10-05  8:00 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2011-10-05  8:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e62c70681e4ce3215f79860befcc518e5df17046
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct  5 07:58:32 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct  5 07:58:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e62c7068

gnome-base/gnome-desktop: fix DPMS timeout and mode setting

This is required for clearing DPMS timeouts and setting DPMS modes to
work on some hardware. Fixes e.g. the problems with gnome-settings-daemon
refusing to turn off the screen.

Upstream bug filed at https://bugzilla.gnome.org/show_bug.cgi?id=660962

---
 ...esktop-3.2.0-dpmssettimeouts-return-value.patch |   91 ++++++++++++++++++++
 ...2.0-r1.ebuild => gnome-desktop-3.2.0-r2.ebuild} |    4 +
 2 files changed, 95 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch
new file mode 100644
index 0000000..cd8b401
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-dpmssettimeouts-return-value.patch
@@ -0,0 +1,91 @@
+From c33e020e4b6119b08c3748209360b7c826e0dfca Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 5 Oct 2011 02:27:48 -0400
+Subject: [PATCH] Ignore DPMSSetTimeouts() and DPMSForceLevel() return value
+
+At least with nvidia binary drivers, DPMSSetTimeouts() and DPMSForceLevel()
+always return BadRequest, even if they succeed. On a machine with intel
+graphics, DPMSForceLevel() was also observed to return BadRequest despite
+successfully changing the DPMS level. So we should just ignore the return
+value from these functions, like xset does.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660962
+---
+ libgnome-desktop/gnome-rr.c |   34 +++++++++++-----------------------
+ 1 files changed, 11 insertions(+), 23 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 465dee9..55ca03b 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -1240,24 +1240,17 @@ static gboolean
+ gnome_rr_screen_clear_dpms_timeouts (GnomeRRScreen *screen,
+                                      GError **error)
+ {
+-    gboolean ret = TRUE;
+-    gint rc;
+-
+     gdk_error_trap_push ();
+-    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
+-    if (gdk_error_trap_pop ())
+-        ret = FALSE;
+-
+-    if (!ret || rc != Success) {
+-        ret = FALSE;
++    /* DPMSSetTimeouts() return value is often a lie, so ignore it */
++    DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
++    if (gdk_error_trap_pop ()) {
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+                              GNOME_RR_ERROR_UNKNOWN,
+                              "Could not set DPMS timeouts");
+-        goto out;
++        return FALSE;
+     }
+-out:
+-    return ret;
++    return TRUE;
+ }
+ 
+ /**
+@@ -1272,7 +1265,6 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+ {
+     CARD16 state = 0;
+     gboolean ret;
+-    gint rc;
+     GnomeRRDpmsMode current_mode;
+ 
+     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+@@ -1305,11 +1297,9 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     }
+ 
+     gdk_error_trap_push ();
+-    rc = DPMSForceLevel (screen->priv->xdisplay, state);
+-    if (gdk_error_trap_pop ())
+-        ret = FALSE;
+-
+-    if (!ret || rc != Success) {
++    /* DPMSForceLevel() return value is often a lie, so ignore it */
++    DPMSForceLevel (screen->priv->xdisplay, state);
++    if (gdk_error_trap_pop ()) {
+         ret = FALSE;
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+@@ -1319,11 +1309,9 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     }
+ 
+     gdk_error_trap_push ();
+-    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
+-    if (gdk_error_trap_pop ())
+-        ret = FALSE;
+-
+-    if (!ret || rc != Success) {
++    /* DPMSSetTimeouts() return value is often a lie, so ignore it */
++    DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
++    if (gdk_error_trap_pop ()) {
+         ret = FALSE;
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+-- 
+1.7.7
+

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
similarity index 93%
rename from gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
index ffbc212..3b01e21 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r2.ebuild
@@ -93,5 +93,9 @@ src_prepare() {
 	# Fix GNomeWallClock fallback code
 	epatch "${FILESDIR}/${P}-GnomeWallClock-fallback.patch"
 
+	# Required for setting DPMS timeouts and modes to work on some hardware;
+	# https://bugzilla.gnome.org/show_bug.cgi?id=660962
+	epatch "${FILESDIR}/${P}-dpmssettimeouts-return-value.patch"
+
 	gnome2_src_prepare
 }



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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2011-10-04  4:04 Alexandre Restovtsev
  0 siblings, 0 replies; 10+ messages in thread
From: Alexandre Restovtsev @ 2011-10-04  4:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e90a114d0f5819701c5113bf436304f9a743ce51
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct  4 03:12:28 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct  4 03:12:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e90a114d

gnome-base/gnome-desktop: add DPMS timeout clearing and fix wall clock fallback

Add upstream patches to add a gnome_rr_screen_clear_dpms_timeouts()
function to clear DPMS timeouts (needed for gnome-settins-daemon), and
to fix the wall clock fallback code to not hang gnome-screensaver.

---
 ...ome-desktop-3.2.0-GnomeWallClock-fallback.patch |   47 ++++++++
 ...3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch |  116 ++++++++++++++++++++
 ...-3.2.0.ebuild => gnome-desktop-3.2.0-r1.ebuild} |   12 ++-
 3 files changed, 174 insertions(+), 1 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch
new file mode 100644
index 0000000..82b59c5
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-GnomeWallClock-fallback.patch
@@ -0,0 +1,47 @@
+From 311476792ba7948f0eba5e4d9a1328cf3ff18950 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 3 Oct 2011 16:35:20 -0400
+Subject: [PATCH 2/2] GnomeWallClock: Fix non-Linux fallback code
+
+This fixes the "infinite loop in gnome-screensaver" bug.  Only
+dispatch in cancel on set when the monotonic timeout has expired,
+otherwise we will drop into a tight loop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660343
+---
+ libgnome-desktop/gnome-datetime-source.c |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-datetime-source.c b/libgnome-desktop/gnome-datetime-source.c
+index 05ec80a..a35d5b3 100644
+--- a/libgnome-desktop/gnome-datetime-source.c
++++ b/libgnome-desktop/gnome-datetime-source.c
+@@ -57,8 +57,10 @@ static gboolean
+ g_datetime_source_is_expired (GDateTimeSource *datetime_source)
+ {
+ 	gint64 real_now;
++	gint64 monotonic_now;
+ 
+ 	real_now = g_get_real_time ();
++	monotonic_now = g_source_get_time ((GSource*)datetime_source);
+ 
+ 	if (datetime_source->initially_expired)
+ 		return TRUE;
+@@ -66,10 +68,11 @@ g_datetime_source_is_expired (GDateTimeSource *datetime_source)
+ 	if (datetime_source->real_expiration <= real_now)
+ 		return TRUE;
+ 
+-	/* We can't really detect without system support when things change;
+-	 * so just trigger every second.
++	/* We can't really detect without system support when things
++	 * change; so just trigger every second (i.e. our wakeup
++	 * expiration)
+ 	 */
+-	if (datetime_source->cancel_on_set)
++	if (datetime_source->cancel_on_set && monotonic_now >= datetime_source->wakeup_expiration)
+ 		return TRUE;
+ 
+ 	return FALSE;
+-- 
+1.7.7
+

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch
new file mode 100644
index 0000000..4e6d780
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.2.0-gnome_rr_screen_clear_dpms_timeouts.patch
@@ -0,0 +1,116 @@
+From 55daaf0972c0021a20624dcd16df5e14cca5d430 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 3 Oct 2011 16:19:23 +0100
+Subject: [PATCH 1/2] When setting the DPMS mode manually, clear the timeouts
+
+Based on a patch from Michael Vogt, many thanks.
+
+Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660482
+---
+ libgnome-desktop/gnome-rr.c |   57 ++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 53 insertions(+), 4 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index d5f0590..465dee9 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -1234,7 +1234,36 @@ out:
+ }
+ 
+ /**
++ * gnome_rr_screen_clear_dpms_timeouts:
++ **/
++static gboolean
++gnome_rr_screen_clear_dpms_timeouts (GnomeRRScreen *screen,
++                                     GError **error)
++{
++    gboolean ret = TRUE;
++    gint rc;
++
++    gdk_error_trap_push ();
++    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
++    if (gdk_error_trap_pop ())
++        ret = FALSE;
++
++    if (!ret || rc != Success) {
++        ret = FALSE;
++        g_set_error_literal (error,
++                             GNOME_RR_ERROR,
++                             GNOME_RR_ERROR_UNKNOWN,
++                             "Could not set DPMS timeouts");
++        goto out;
++    }
++out:
++    return ret;
++}
++
++/**
+  * gnome_rr_screen_set_dpms_mode:
++ *
++ * This method also disables the DPMS timeouts.
+  **/
+ gboolean
+ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+@@ -1243,6 +1272,7 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+ {
+     CARD16 state = 0;
+     gboolean ret;
++    gint rc;
+     GnomeRRDpmsMode current_mode;
+ 
+     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+@@ -1251,8 +1281,10 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     ret = gnome_rr_screen_get_dpms_mode (screen, &current_mode, error);
+     if (!ret)
+         goto out;
+-    if (current_mode == mode)
++    if (current_mode == mode) {
++        ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
+         goto out;
++    }
+ 
+     switch (mode) {
+     case GNOME_RR_DPMS_ON:
+@@ -1273,12 +1305,11 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+     }
+ 
+     gdk_error_trap_push ();
+-    ret = DPMSForceLevel (screen->priv->xdisplay, state);
+-    gdk_flush ();
++    rc = DPMSForceLevel (screen->priv->xdisplay, state);
+     if (gdk_error_trap_pop ())
+         ret = FALSE;
+ 
+-    if (!ret) {
++    if (!ret || rc != Success) {
+         ret = FALSE;
+         g_set_error_literal (error,
+                              GNOME_RR_ERROR,
+@@ -1286,6 +1317,24 @@ gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+                              "Could not change DPMS mode");
+         goto out;
+     }
++
++    gdk_error_trap_push ();
++    rc = DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
++    if (gdk_error_trap_pop ())
++        ret = FALSE;
++
++    if (!ret || rc != Success) {
++        ret = FALSE;
++        g_set_error_literal (error,
++                             GNOME_RR_ERROR,
++                             GNOME_RR_ERROR_UNKNOWN,
++                             "Could not set DPMS timeouts");
++        goto out;
++    }
++
++    ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
++    if (!ret)
++        goto out;
+ out:
+     return ret;
+ }
+-- 
+1.7.7
+

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
similarity index 89%
rename from gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
index 300f0d8..ffbc212 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit git-2 gnome2-live
 fi
@@ -85,3 +85,13 @@ src_unpack() {
 			die "ln -sf failed"
 	fi
 }
+
+src_prepare() {
+	# Useful upstream patches, will be in next release
+	# Clear DPMS timeouts, bug #385063
+	epatch "${FILESDIR}/${P}-gnome_rr_screen_clear_dpms_timeouts.patch"
+	# Fix GNomeWallClock fallback code
+	epatch "${FILESDIR}/${P}-GnomeWallClock-fallback.patch"
+
+	gnome2_src_prepare
+}



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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2011-05-30 17:11 Nirbheek Chauhan
  0 siblings, 0 replies; 10+ messages in thread
From: Nirbheek Chauhan @ 2011-05-30 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     83334b14de9c23effc647d077db6e94b64c2aa15
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue May 24 03:43:00 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 15:47:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=83334b14

gnome-desktop-3.0.2 version bump

* Patch has been applied upstream.

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 ...ome-desktop-3.0.1-fix-randr-missing-crash.patch |   30 --------------------
 ...-3.0.1-r1.ebuild => gnome-desktop-3.0.2.ebuild} |    6 ----
 2 files changed, 0 insertions(+), 36 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch
deleted file mode 100644
index 5402a20..0000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 30 Apr 2011 20:48:03 -0400
-Subject: [PATCH] Don't fall over if RANDR is missing
-
-When RANDR is not present, the screen object never gets an info,
-and since screen_info_free asserts, we must not call it unconditionally
-in finalize.
-This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
----
- libgnome-desktop/gnome-rr.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index 4a9d98e..eb3d735 100644
---- a/libgnome-desktop/gnome-rr.c
-+++ b/libgnome-desktop/gnome-rr.c
-@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
- 
-     gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
- 
--    screen_info_free (screen->priv->info);
-+    if (screen->priv->info)
-+      screen_info_free (screen->priv->info);
- 
-     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
- }
--- 
-1.7.5
-

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
similarity index 92%
rename from gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
index fce1620..87d2013 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild
@@ -58,9 +58,3 @@ pkg_setup() {
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=365717
-	epatch "${FILESDIR}/${P}-fix-randr-missing-crash.patch"
-	gnome2_src_prepare
-}



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

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2011-05-02 15:56 Nirbheek Chauhan
  0 siblings, 0 replies; 10+ messages in thread
From: Nirbheek Chauhan @ 2011-05-02 15:56 UTC (permalink / raw
  To: gentoo-commits

commit:     c249b133b6ecf094bf9e1a23b37a33c0497acc31
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 15:54:43 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May  2 15:54:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c249b133

gnome-base/gnome-desktop: fix bug 365717

---
 ...ome-desktop-3.0.1-fix-randr-missing-crash.patch |   30 ++++++++++++++++++++
 ...-3.0.1.ebuild => gnome-desktop-3.0.1-r1.ebuild} |    6 ++++
 2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch
new file mode 100644
index 0000000..5402a20
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.0.1-fix-randr-missing-crash.patch
@@ -0,0 +1,30 @@
+From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 30 Apr 2011 20:48:03 -0400
+Subject: [PATCH] Don't fall over if RANDR is missing
+
+When RANDR is not present, the screen object never gets an info,
+and since screen_info_free asserts, we must not call it unconditionally
+in finalize.
+This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
+---
+ libgnome-desktop/gnome-rr.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 4a9d98e..eb3d735 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
+ 
+     gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
+ 
+-    screen_info_free (screen->priv->info);
++    if (screen->priv->info)
++      screen_info_free (screen->priv->info);
+ 
+     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
+ }
+-- 
+1.7.5
+

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
similarity index 92%
rename from gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild
rename to gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
index 87d2013..fce1620 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.0.1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.1-r1.ebuild
@@ -58,3 +58,9 @@ pkg_setup() {
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
+
+src_prepare() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=365717
+	epatch "${FILESDIR}/${P}-fix-randr-missing-crash.patch"
+	gnome2_src_prepare
+}



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

end of thread, other threads:[~2019-09-14 21:00 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-14 21:00 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/ Sobhan Mohammadpour
  -- strict thread matches above, loose matches on Subject: below --
2019-02-23 20:37 Mart Raudsepp
2018-11-16 17:25 Gilles Dartiguelongue
2012-11-21 22:27 Gilles Dartiguelongue
2012-10-28 16:42 Gilles Dartiguelongue
2011-10-18  7:37 Alexandre Restovtsev
2011-10-05  8:00 Alexandre Restovtsev
2011-10-04  4:04 Alexandre Restovtsev
2011-05-30 17:11 Nirbheek Chauhan
2011-05-02 15:56 Nirbheek Chauhan

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