Version bump. Introduce own SLOT for GTK+ 3.x version and use it for installing headers.

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 126 insertions, 9 deletions

diff --git a/dev-libs/girara/ChangeLog b/dev-libs/girara/ChangeLog
index 5f147de50e46..b9b97da6f474 100644
--- a/dev-libs/girara/ChangeLog
+++ b/dev-libs/girara/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/girara
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/ChangeLog,v 1.20 2013/01/11 16:36:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/ChangeLog,v 1.21 2013/01/27 21:47:48 ssuominen Exp $
+
+*girara-0.1.5-r300 (27 Jan 2013)
+*girara-0.1.5-r200 (27 Jan 2013)
+
+  27 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +girara-0.1.5-r200.ebuild, +girara-0.1.5-r300.ebuild:
+  Version bump. Introduce own SLOT for GTK+ 3.x version and use it for
+  installing headers.
 
   11 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> girara-0.1.4.ebuild:
   Keyword ~arm wrt #368757 (tested with cortex-a8, hardfloat)
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index a86a14e645cf..1f4458730193 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA256
 
 DIST girara-0.1.4.tar.gz 73645 SHA256 831cf523b131bfa1c182efbf146d68fb642fe62d22ee199caf0cd71408a85739 SHA512 fef0cca93fcda4170dbdfbe821d939c0248188fa5e4965d008339230f36e6ff2feec055cc87f4da4f7d813ccb29afb4e58720cbf13868c32c6ec50a40a5e258f WHIRLPOOL 6b004a5c5dda64c1b5a41df9bf30447df854f3b3f6eed04d3b89d80a110a5b3f370698a53dc664d78c7cb4abce6fa97e3613f77e31afb43c3f4632a706eda50d
+DIST girara-0.1.5.tar.gz 73949 SHA256 8d2eeb6aa27286a298ef7b08017a3f702bcd84bfe61a382acebb79d4ab1cd1c1 SHA512 d170be2e5fe3388e2b6c2cca8a3a4d506625ff6c8d07e6f2e191042f924104756dc975310f0d8d9b7487204ac1f1a0b76a52ec9930aaeb242a029d1e03ccc54f WHIRLPOOL 3bd0261fc8ba4a7585496c8179c5613e02028423a07da47843943c0250ff1b733a29408d514756fe03ea3ec9234cc4ac1cba178f4b1c8c84ca86a851968ca58a
 EBUILD girara-0.1.4.ebuild 1157 SHA256 7bf699f047180e63d73c6b161aad767c898fe4c18d36a3ab87439fe481f7de4d SHA512 fc7b80243f16429866693547aedc4c48754b568d6686a207979952ffb12c9cbd9979a6bddbbf5a5856ab872b0f48d083c70be2ac9a9572acc958b06e87d542b4 WHIRLPOOL 0202969137fab64b837940052a3745ea33b7f8b565c5320f59b89aa475dfd324a689e7081fa2bf50438d73e9e0abb8833b19a6dd1534f4dc51d399f4e77f647b
-MISC ChangeLog 2603 SHA256 e1ae1838d9d28e9947f714e58582e11a2a98fd8cf706cfdc49e0251b5e62e24a SHA512 02fbb6977d0b297dfa59518e3e1c624b4f4f3feaa3072c8374b74a8a2766765e4c031337de3837a289917a370c4e7dc0e32f6661ee7f510cb888609dab01cca8 WHIRLPOOL 67a28e90fd623a0b9b709cd881bb9008fed2b065bcc14f16e7b5bb7c997960d60b934080cea32a248216a12369966ced925198b0330bf0a0868c087f1af4a8ed
+EBUILD girara-0.1.5-r200.ebuild 1251 SHA256 7c10b549a1fcf9ef82d6a6114d3e2b24421c82575a49626618087afa79308e83 SHA512 e9e5f3da82515e95224207551b613c7876a5c6a73931ad62530fdbdd62cf94ee2010dd55f23d5703770da429fce5dae294cb96520f5b1b10057af49ea9441afb WHIRLPOOL e81cc379492aacdcfe16e593e7f364eb174f9b5a4546d73d79f6169260d7f11f66727bc82894f3bd152ce7a38e851f6d01539195dfee34ed081ccce17c2c2b22
+EBUILD girara-0.1.5-r300.ebuild 1164 SHA256 9ed67f5b8450a203b9fe6962583d8f6fd63d519973bbf87cb4afa12fed45c7b6 SHA512 0198888614c946383eeaead1e9214425d68a0635d93cbfd6c7785c42e5f7e5580d4dda4750ed259ecda5212fa63f38e237f48b2f1c1ad6dbe201c19c0349c9d2 WHIRLPOOL 8f89757f146a2199ef9f3fa8351934dc032c554e92ecfab0c801f334f9dc5a42bcddf52f7731bf70bdf9d0cf2838b046990cc0066f400d04cc4e5b2bdc3d02f7
+MISC ChangeLog 2874 SHA256 5a91f1fa891adfa485db367a8a61edaa7511890590af97012b678effa225a798 SHA512 52f776d0ba0f69877d6426fb1e10a7d1a403c6ed87af73af764259aaade1cd1c85a59b537ce9c60b6952ac514ecb122bdb0de0bbd3299e50d4820e8f3ef675a2 WHIRLPOOL 0ee909e111c0bf14ad4d1a70680db6ff1de86e6bf520ac395049ffcaec177b593f39c58528cd6d7b798d092a5d1e467c82c0cee449d2c4d1cf5154422eb9ae1e
 MISC metadata.xml 342 SHA256 57da1012a80ac7b3f5844c593af2f963adb5318cffc057cbe243b4bc7bc356ce SHA512 8ec10499ea8c8792afe0bdfea65c61614ecce69b759ec43e65c2fc2d1577bb98a057bbb580edc3a658ecb477bb14a834a3f66aa757948759633033a20503bccd WHIRLPOOL 7572e8d401cc445f7325bcf28a49654edb3001e6a94f4c6631ee038789880dac8dab0e9d8f7d607ea0f43be2475ae3e2966959a49c9ade9441be7dd284fe7c5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ8D9pAAoJEEdUh39IaPFNrBAIAIe5uihexiPgpwIkmVzm3GaI
-/MIQENaIDAyR03yf2MjRNZae6p1byKbsNafBn6+/1yuUumj2Z8HvqIomWLs0ll+e
-W5eBq5lH44dqoX3xXCmnoHJqURpq9wxu0Jf2vA68jwPvFrwB/KQr7YVbi5U+Fyg1
-LaKCmUoRbnkO+INTTSH0ZKyYLpdfbLuW87wCKU6QG2ImxoQ4/GdBPQkjnejl3YuL
-0i+ghH2mNnF+MKIhgfQf5gN7k0nUbJvOXaPESPgt4Lklxxjm2C/tndA0Vo61JwUT
-Ly+iGFxTkZ2oPHQ24BK0mVCjIZDYFdQJR6f4BpKl4bBEyFUijqbznJMvuydU96c=
-=qew0
+iQEcBAEBCAAGBQJRBaBmAAoJEEdUh39IaPFN6kIH/0FXetkBSro+x2xzG8NiNONe
+n21hng1QnHmEazyCQ4bC75B5RkuijEUt5/ipRhQgugwrN2Okc4GU4/F2fQr0Qd1A
+KZsWeNsh5Rvdun7EQkNP+B2nW10gKNRxB8a5BTQ6+M5AhKe2D0qqdT8O+9ksGzeX
+4hY4awiLplkgGH0jrYUPtziphWkicFKY8iKYFmYaCIzSqZYKta/kAGTTfW6Simsy
+wRLd/2A0gcFXzJWZ4TXEQ5qxCmVWgjqHe1aQe85nLdKLOGXgG1jJKgSl6Qeahx/3
+3URPh+B7/mKcut8meaNopSnIpTz619VKofy95QWVSSL4TDUPsAND5cUEvsutjJM=
+=S4iG
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/girara/girara-0.1.5-r200.ebuild b/dev-libs/girara/girara-0.1.5-r200.ebuild
new file mode 100644
index 000000000000..cfd92c3c5119
--- /dev/null
+++ b/dev-libs/girara/girara-0.1.5-r200.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-0.1.5-r200.ebuild,v 1.1 2013/01/27 21:47:48 ssuominen Exp $
+
+EAPI=5
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A library that implements a user interface that focuses on simplicity and minimalism"
+HOMEPAGE="http://pwmt.org/projects/girara/"
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+# Pull in SLOT="3" for headers
+RDEPEND="${CATEGORY}/${PN}:3
+	>=x11-libs/gtk+-2.18.6:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	mygiraraconf=(
+		PREFIX="${EPREFIX}"/usr
+		LIBDIR='${PREFIX}'/$(get_libdir)
+		GIRARA_GTK_VERSION=2
+		CC="$(tc-getCC)"
+		SFLAGS=""
+		VERBOSE=1
+		DESTDIR="${D}"
+		)
+}
+
+src_prepare() {
+	# Remove 'static' and 'install-static' targets
+	if ! use static-libs; then
+		sed -i \
+			-e '/^${PROJECT}:/s:static::' \
+			-e '/^install:/s:install-static::' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	emake "${mygiraraconf[@]}"
+}
+
+src_install() {
+	emake "${mygiraraconf[@]}" install
+	dodoc AUTHORS
+
+	rm -rf "${ED}"/usr/include/${PN}
+}
diff --git a/dev-libs/girara/girara-0.1.5-r300.ebuild b/dev-libs/girara/girara-0.1.5-r300.ebuild
new file mode 100644
index 000000000000..5d7b4b9b15bb
--- /dev/null
+++ b/dev-libs/girara/girara-0.1.5-r300.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/girara/girara-0.1.5-r300.ebuild,v 1.1 2013/01/27 21:47:48 ssuominen Exp $
+
+EAPI=5
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A library that implements a user interface that focuses on simplicity and minimalism"
+HOMEPAGE="http://pwmt.org/projects/girara/"
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=x11-libs/gtk+-3.0.11:3"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	mygiraraconf=(
+		PREFIX="${EPREFIX}"/usr
+		LIBDIR='${PREFIX}'/$(get_libdir)
+		GIRARA_GTK_VERSION=3
+		CC="$(tc-getCC)"
+		SFLAGS=""
+		VERBOSE=1
+		DESTDIR="${D}"
+		)
+}
+
+src_prepare() {
+	# Remove 'static' and 'install-static' targets
+	if ! use static-libs; then
+		sed -i \
+			-e '/^${PROJECT}:/s:static::' \
+			-e '/^install:/s:install-static::' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	emake "${mygiraraconf[@]}"
+}
+
+src_install() {
+	emake "${mygiraraconf[@]}" install
+	dodoc AUTHORS
+}