Merge remote-tracking branch 'bohr/master'

With conflict fixes

Conflicts:
 metadata/layout.conf
 profiles/repo_name
 x11-plugins/pidgin-extended_blist_sort/Manifest
 x11-plugins/pidgin-toobars/Manifest

5 files changed, 99 insertions, 0 deletions

diff --git a/x11-plugins/pidgin-toobars/Manifest b/x11-plugins/pidgin-toobars/Manifest
index be05199..c8976a1 100644
--- a/x11-plugins/pidgin-toobars/Manifest
+++ b/x11-plugins/pidgin-toobars/Manifest
@@ -1,2 +1,10 @@
 DIST pidgin-toobars-1.5.tar.gz 402293 RMD160 aa03f1122110d77b88c8a88c9ad597698ab8319a SHA1 615963da54e55163cce2c0c87e67449bd079eeb9 SHA256 05b79d91d7c659daabf651bb61ef6c6e5a4fd3d2c31f378293ccf593d1806426
 EBUILD pidgin-toobars-1.5.ebuild 561 RMD160 493c3cb9d8c00660930c49a5119d5403b0927418 SHA1 371c97237d7e771cf5f669fd99bd7af849c1489f SHA256 7890c2dedf23d013b367b982a11dc0a465d9cf48fad5593b4d4e3fed93f4687b
+AUX foo.sh 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+DIST pidgin-toobars-1.11.tar.gz 429258 RMD160 a6110d2ea33c88882ab2a51428761c2dc0fce311 SHA1 8f2a2bfc0349eb0af2177b2ce045386ad8e50248 SHA256 f830ad8573602202a06c2a20afe0bb6b564a3b5d62f0549ca905682b0bdb588d
+DIST pidgin-toobars-1.6.tar.gz 406412 RMD160 4a386cc5c41129d95a688e230c67b315d9d0e889 SHA1 57f4564cd8dd4b1ab8fc701650cb5d6e76534495 SHA256 a8bcfe76efe6d2afc8fe2c2629e90b4ef5e06d5eb5f04689ee85b02bc4bd7e3c
+DIST pidgin-toobars-1.7.tar.gz 778788 RMD160 390fc7dd4bba26428f4d93a1cebbdc8e35fd05cc SHA1 9798e07bb0bf3b68faae58dfa4077bb6a37c29da SHA256 18ddfbd6b41b5a1dc7a47528b6e2e842ea08badf990db92be880925664080a89
+EBUILD pidgin-toobars-1.11.ebuild 754 RMD160 27a3a59ea24f8e535ff352f37a61cec8b0a30b0e SHA1 c8e304ce1de5f420ada15bd506a3509adc59e09b SHA256 cbe90b9acef2a2795d92e1d9f1175f909be92d16101f0230044c185f48168c63
+EBUILD pidgin-toobars-1.6.ebuild 732 RMD160 132f3d39b64a5f5c479a1a079c36f9a3ba9fc050 SHA1 2fe784c80542cd642e29f7704ef815e5a672dad6 SHA256 5ef0a7ba6a19c4427a4d284beeadddee1c55623d5756645a31ff688f6d7b2205
+EBUILD pidgin-toobars-1.7.ebuild 748 RMD160 b4c46d5de43b44497692c2e785c6a0ab6c4c61b9 SHA1 863096cd268a7d44b0784ac6ad981d4edbf01efd SHA256 882c299010d7a891282cda2e70cddaf38686ba5bc45156629a88a57f0e51fcd2
+MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/x11-plugins/pidgin-toobars/files/foo.sh b/x11-plugins/pidgin-toobars/files/foo.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/x11-plugins/pidgin-toobars/files/foo.sh
diff --git a/x11-plugins/pidgin-toobars/pidgin-toobars-1.11.ebuild b/x11-plugins/pidgin-toobars/pidgin-toobars-1.11.ebuild
new file mode 100644
index 0000000..b420665
--- /dev/null
+++ b/x11-plugins/pidgin-toobars/pidgin-toobars-1.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Plugin adds toolbar and status bar to Pidgin buddy list"
+HOMEPAGE="http://vayurik.ru/wordpress/en/toobars"
+SRC_URI="http://vayurik.ru/wordpress/wp-content/uploads/toobars/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc README AUTHORS VERSION ChangeLog
+}
+
+pkg_postinst() {
+	elog "Please note that the MyStatusBar (in purple-plugin_pack) conflicts"
+	elog "with TooBars and you should only turn one on at a time."
+}
diff --git a/x11-plugins/pidgin-toobars/pidgin-toobars-1.6.ebuild b/x11-plugins/pidgin-toobars/pidgin-toobars-1.6.ebuild
new file mode 100644
index 0000000..11a97a6
--- /dev/null
+++ b/x11-plugins/pidgin-toobars/pidgin-toobars-1.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+DESCRIPTION="Plugin adds toolbar and status bar to Pidgin buddy list"
+HOMEPAGE="http://vayurik.ru/wordpress/en/toobars"
+SRC_URI="http://vayurik.ru/wordpress/wp-content/uploads/toobars/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc README AUTHORS VERSION ChangeLog
+}
+
+pkg_postinst() {
+	elog "Please note that the MyStatusBar (in purple-plugin_pack) conflicts"
+	elog" with TooBars and you should only turn one on at a time."
+}
diff --git a/x11-plugins/pidgin-toobars/pidgin-toobars-1.7.ebuild b/x11-plugins/pidgin-toobars/pidgin-toobars-1.7.ebuild
new file mode 100644
index 0000000..ba452c1
--- /dev/null
+++ b/x11-plugins/pidgin-toobars/pidgin-toobars-1.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Plugin adds toolbar and status bar to Pidgin buddy list"
+HOMEPAGE="http://vayurik.ru/wordpress/en/toobars"
+SRC_URI="http://vayurik.ru/wordpress/wp-content/uploads/toobars/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-im/pidgin[gtk]"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc README AUTHORS VERSION ChangeLog
+}
+
+pkg_postinst() {
+	elog "Please note that the MyStatusBar (in purple-plugin_pack) conflicts"
+	elog" with TooBars and you should only turn one on at a time."
+}