Drop support for old gnome-panel (#508854)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 93 insertions, 5 deletions

diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index f68a1c3db552..c59eeb0d748b 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/lablgtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.108 2014/01/16 00:02:18 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.109 2014/05/18 18:55:57 pacho Exp $
+
+*lablgtk-2.18.0-r1 (18 May 2014)
+
+  18 May 2014; Pacho Ramos <pacho@gentoo.org> +lablgtk-2.18.0-r1.ebuild:
+  Drop support for old gnome-panel (#508854)
 
   16 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> lablgtk-2.18.0.ebuild:
   Keyworded amd64-linux, x86-linux
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 7e0b1ffb1ec4..7da996691eeb 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -4,13 +4,14 @@ Hash: SHA256
 DIST lablgtk-2.16.0.tar.gz 787217 SHA256 a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f SHA512 e886607fd92f180cd1b7e09ccea7ca380ebeb1620fe30a7b7f543d59bbbdd21571e0b1c2d3ce4218aecdfa25511b8957058b508ae7f5421a3d36ccff1dbeffea WHIRLPOOL 90a8ae8ec494ebb7abdd4b35417d6631dce5a4803d1d7c68ce9b34f02b0213acafec928fd39bc36c0ab5b43c350e0cc942ad609c1f53f33beec99aad32c7438b
 DIST lablgtk-2.18.0.tar.gz 789507 SHA256 c76a7ae9454e89365666cf19728dbb51edb6810e2e57032b3bebd53ccec5946e SHA512 5bb8eb753c928b4a7771e33a2f821dbc76fa64ce35df509884d11ce57efde90ceceb2fe94a57311f13c5106956f24d0fae581134a1a43c0645ff41c66fbd5461 WHIRLPOOL e4b17de89f6e4a41b385cd0c06fdecb9943a5f675bf5a168ade20f421b66901d307430d0789018972c889491be7c9a06dc2a38ccb3e5eef2e8f1ad8663ae4e94
 EBUILD lablgtk-2.16.0.ebuild 2774 SHA256 f2e33f01c15d732f090345d0cbd769d0fcfacacbb2d640d7b2f4c9f6e9b54b1e SHA512 184811a927754312f0ac87833dfc0d5305020fe05c7685f853bdbe417e910851f274e3624cd5212ec3feea1cdf0c32f3cf54f678a5199b6a3be46c2563f1ffae WHIRLPOOL 38e1c3bf6eea8a794e3b3c885c99630d5410755858a9e3c34ca3d9484a9a0b09873826de61b2a47c51197d2256f2001d469209349b1b855acc5a9a6d1987947b
+EBUILD lablgtk-2.18.0-r1.ebuild 2587 SHA256 4141c0acdf9e43c84754180d46ef6e153d9f1d4b8a1d56c03a7884b894989a4f SHA512 a0552d4511724ebd22536b04ba4c8857ba54c84433772fcc387383fa32972a0fec89c935f54ebfee2e778b87ef9753ed11fd848609059983764a42ff917dfcba WHIRLPOOL 2cdc3c4b4c40121191fb586717f6c72989dc9100ccda52b955a285e1764628f01337492ce83b170b94d45ac3d9aada3e589abe0eacfddeaf67619a30aac1d2a7
 EBUILD lablgtk-2.18.0.ebuild 2848 SHA256 fbfd659babe6618a82c61b823ce16d1d7b783da384de0d3e283c7672b9dcb500 SHA512 95da5d0a008a43c4bc4851b4df6a398b67af683c28c25073833ee26d182afb8da71d0f71bb9012bac07706bd5978273b5925f838d4a734552af03ff85708cd80 WHIRLPOOL f59ea140731d0fc8a1f78499917611296e7b748e525237a569a8b56d34bd7c56d3b87b359bfa6b00de3efd895654d328f615f9dd46349ac368ed941a2a2ff756
-MISC ChangeLog 13988 SHA256 8e35acbd491ebc868c9e988a405ead286e54cc2383ce2139161e89896c6a4c33 SHA512 e0cfc730cc634505cacd41eaba7069ac5fac0eeabc3f84a005d091abb586bc9de7cf7cdfff8f87e13c7452bd495be80b178b745bbd51c0088b2a65ac50d3676f WHIRLPOOL 2f55c9f1983b6d14617deaf5df4ba7b0c2d69489dc09af17a5181bc2a023a566a1e49bcb1984353daec7d6c771bf371980291961b90d8480e0218c7cebcb750a
+MISC ChangeLog 14138 SHA256 a450ce3e57ae2ce8a55f81c93a3e085aec397d547b8f90e9778188b003c87c1e SHA512 06775f51810e51a37412645cf56626c20e04da3bbaaa14e8aac86446de79af3d1ddb08df6bcf88ada5025d7d243ad4afcdcebfdf4e26aa3f96eb2726f8253dfa WHIRLPOOL f1ea7450bdefda3dfb0b5ea7b97159220870d1f13ec378c1002e7b5bad2c2fe5c73422f8c65ad99be44a42a2c8051fc6d49d2d5cb4729d9826291d919b05f7f7
 MISC metadata.xml 372 SHA256 ae0b87241d6b64bb768c0c3e482efd98d2e904ab09f4c49020e19c5896bf93e2 SHA512 a855aa9743082fbbc6e2d389da59bfc749c5833c78f3b857c4af63482aa80f750fa519e62fe4d38a87127c1dc641f6f36df301b8a1148c16085b80ebd163f115 WHIRLPOOL 78a348ff4d485b7c4a44c2249d74fe271c38ac4be195875ac2414aff7e4c0aca60bb59460cf2d1526a230ab4394678e62d2b67eb0ad97a67b67ee22023e9aae0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLXIYwACgkQ1ycZbhPLE2BjrwCbByYL7pc3+y53+pf69IqyklE2
-QwkAnRlcpAsHhXvQDPu9FU1eOJ3ZN9jy
-=yL+M
+iEYEAREIAAYFAlN5Aj8ACgkQCaWpQKGI+9RDSwCfV3+ulwEgsFYfBv1mKBleMFn+
+sugAn2pX1BmPiThiZVPG94a41DJ/i6Cn
+=vsvk
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgtk/lablgtk-2.18.0-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.18.0-r1.ebuild
new file mode 100644
index 000000000000..b7ca659dbfa6
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.18.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.18.0-r1.ebuild,v 1.1 2014/05/18 18:55:57 pacho Exp $
+
+EAPI=5
+
+inherit multilib findlib
+
+IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg"
+
+DESCRIPTION="Objective CAML interface for Gtk+2"
+HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1261/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
+
+RDEPEND=">=x11-libs/gtk+-2.10:2
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	svg? ( >=gnome-base/librsvg-2.2:2 )
+	glade? ( >=gnome-base/libglade-2.0.1 )
+	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
+	opengl? ( >=dev-ml/lablgl-0.98:=
+		>=x11-libs/gtkglarea-1.9:2 )
+	spell? ( app-text/gtkspell:2 )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+SLOT="2/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_with svg rsvg) \
+		$(use_with glade) \
+		--without-gnomeui \
+		--without-panel \
+		$(use_with opengl gl) \
+		$(use_with spell gtkspell) \
+		--without-gtksourceview \
+		$(use_with sourceview gtksourceview2) \
+		$(use_with gnomecanvas)
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+install_examples() {
+	insinto /usr/share/doc/${P}/examples
+	doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
+
+	# Install examples for optional components
+	use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
+	use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
+	use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
+	use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
+	use opengl && insinto /usr/share/doc/${PF}/examples/GL && doins examples/GL/*.ml
+
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+src_install () {
+	findlib_src_preinst
+	export OCAMLPATH="${OCAMLFIND_DESTDIR}"
+	emake install DESTDIR="${D}"
+
+	rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf"
+
+	dodoc CHANGES README CHANGES.API
+	use examples && install_examples
+}
+
+pkg_postinst () {
+	if use examples; then
+		elog "To run the examples you can use the lablgtk2 toplevel."
+		elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml"
+	fi
+}