diff options
Diffstat (limited to 'dev-cpp/libglademm')
| -rw-r--r-- | dev-cpp/libglademm/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-cpp/libglademm/Manifest | 20 | ||||
| -rw-r--r-- | dev-cpp/libglademm/files/gcc34.patch | 13 | ||||
| -rw-r--r-- | dev-cpp/libglademm/files/libglademm-2.2.0-configure.patch | 20 | ||||
| -rw-r--r-- | dev-cpp/libglademm/libglademm-2.0.1.ebuild | 23 | ||||
| -rw-r--r-- | dev-cpp/libglademm/libglademm-2.2.0.ebuild | 29 | ||||
| -rw-r--r-- | dev-cpp/libglademm/libglademm-2.6.4.ebuild | 6 | ||||
| -rw-r--r-- | dev-cpp/libglademm/libglademm-2.6.7.ebuild | 44 |
8 files changed, 44 insertions, 121 deletions
diff --git a/dev-cpp/libglademm/ChangeLog b/dev-cpp/libglademm/ChangeLog index 0a235e5d5727..319fbcd31e95 100644 --- a/dev-cpp/libglademm/ChangeLog +++ b/dev-cpp/libglademm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-cpp/libglademm -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.77 2008/11/17 20:53:46 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.78 2010/04/03 11:26:26 eva Exp $ + + 03 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> -files/gcc34.patch, + -libglademm-2.0.1.ebuild, -libglademm-2.2.0.ebuild, + -files/libglademm-2.2.0-configure.patch, libglademm-2.6.4.ebuild, + libglademm-2.6.7.ebuild: + Kill slot 2 since it is unused. Clean up ebuild and bring it to EAPI=3. 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> files/libglademm-2.2.0-configure.patch: diff --git a/dev-cpp/libglademm/Manifest b/dev-cpp/libglademm/Manifest index 70d2ee12e23d..288eaeaa2ac1 100644 --- a/dev-cpp/libglademm/Manifest +++ b/dev-cpp/libglademm/Manifest @@ -1,24 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX gcc34.patch 524 RMD160 347bd2aec509e06f279f28d906537bd253971f31 SHA1 7157165845b5a2ebf85fae4de3d9b8883f1ad207 SHA256 251240958def6c96c976e94b1993a9f0ca2382fd37dda33aa721a620c0f04155 -AUX libglademm-2.2.0-configure.patch 648 RMD160 4b622ab5b6886a1b506b8ef97c9969609face1b1 SHA1 7ad0b23fc841458143a127db24f204580ddec60c SHA256 5a8aa87e7132dd803ad14df24ae8a77eabc249648a5da2167bd8dc3e1d23bb30 -DIST libglademm-2.0.1.tar.gz 238383 RMD160 9855a7cc467a696c420a6b28b2f69b975cd48684 SHA1 8d59fc80ce44ef72ebfcde3dbfea216a19f6ccb0 SHA256 96d1869a04690d38ea44c81bfa4b04a7401696373eaf82bf71310d4f83eb013a -DIST libglademm-2.2.0.tar.bz2 241553 RMD160 4cecf27a081a94dd20cf890f69d1e2f1be5b4c6d SHA1 7b8ecd5561c8d9ec2d7356868a3273906ee3846c SHA256 22a0f35612d9c482c17b12229f69f22e5a52b02451f75242bc78835d1d3c8b8d DIST libglademm-2.6.4.tar.bz2 307057 RMD160 de19f129c7af4b4b990d95a68f406460caf99200 SHA1 7db86cb5942e7eed5668776e49aeb3731b3a34c9 SHA256 d563e7b601e84d1b04a44a09510407b5a7e2f00a9ad58802169e6650d5596ffa DIST libglademm-2.6.6.tar.bz2 333112 RMD160 a0d5f9a7454be2f11d16843c3d94c8c8bd6bde0f SHA1 5d3a43bc08fd0c0ba06c8288efa6d2f5d18ce42e SHA256 ff3928acea466b3cda3739d3a67748cb942948da853cb114d1379933224b0e60 DIST libglademm-2.6.7.tar.bz2 326385 RMD160 3bfe5962e57721dfa9d02c3be31b543bf070c767 SHA1 d7c0138c80ea337d2e9ae55f74a6953ce2eb9f5d SHA256 38543c15acf727434341cc08c2b003d24f36abc22380937707fc2c5c687a2bc3 -EBUILD libglademm-2.0.1.ebuild 673 RMD160 03827a9f0a7c8979194e84958a08402175e51dd1 SHA1 e102bc4f1b96f456334361ef49ef762e31f6c5cb SHA256 cc96fd99b522f33989312ec74bd77032a4bcfd907a601a2a922f338ef0edbe30 -EBUILD libglademm-2.2.0.ebuild 755 RMD160 e59ca23ed35a1af4900d1a72a45c9ca9669770b0 SHA1 360b71852b09befadd549108fb73f962d489eedc SHA256 50c17b02e974ee61eb176bcfb79e776e9eec7e3a11efac648b45fd159822ea00 -EBUILD libglademm-2.6.4.ebuild 1207 RMD160 95332e1cb37c3c5e79d3766c945f2c2dd5780564 SHA1 a920a3bc1d15a2005b42294a7bdabc0a01ac11a4 SHA256 b70b108820e8386dcab350f133ac78487b3da69a64e4790f14517773c8cd64e2 +EBUILD libglademm-2.6.4.ebuild 1160 RMD160 f1a532bad882caadbec8fdbe2c12b44fbfef8ac5 SHA1 c0470757fe32cd1c20182f6fd19d7b7ed47571f1 SHA256 77f4e05d6970eefbab742836c8997331871aa89dd7bc2ee19ab80010b56b7928 EBUILD libglademm-2.6.6.ebuild 1208 RMD160 49b8b963c381c470d62e110e3bde224ff3d1e703 SHA1 d30175a15b25ebbcbb7f53e3cf99e56009257535 SHA256 e12f1d634eba338816d061d91cbc06e530a9b22adb5c94f304e2117a73a7972b -EBUILD libglademm-2.6.7.ebuild 1215 RMD160 2dc0eef9992834e5403bae31a63c88f08cc222f6 SHA1 e66f532de40f22da6a4caa4b22554c9f6cde30dd SHA256 51d19201391c642c344e6980a8e7b4e491b88e33f201ef1fd2fecebc4c137994 -MISC ChangeLog 10499 RMD160 db47dfec4a414845576ead9e91726b5fb06801a7 SHA1 d65040796f1e60f9bfdb6647ace22af90b007e33 SHA256 1b4ef5c2a56f632933288a85bf07822b97fbc505a6ba9390db0545243e76a24c +EBUILD libglademm-2.6.7.ebuild 1606 RMD160 9c203ebe835d39969278627405a72266fe423223 SHA1 f46cbb0aba84fd5b9f86c62d4425712d024f84d3 SHA256 3b8b3abee37c55de04ba2e4be1fe12d9525297ad59040e8ae934b07a631d2cea +MISC ChangeLog 10791 RMD160 1958559d95000e81c2e5b22d96c5c4fd15f68bba SHA1 d4c27647872c558d978fdb8a5fc848a667768472 SHA256 b08cc77f54038145deae0df9df7d81d980cc888f4c861e608a8d651921a2d64d MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkkh2eAACgkQAiZjviIA2XhhmQCg2H5HlfahoUkaBRgzneRJn/Zx -tjMAn0qco74tNRX8FdaUgZWY7EW1qkyl -=XaH1 +iEYEARECAAYFAku3JecACgkQ1fmVwcYIWAYpigCfeHyDZ7UWFJQVBebasFVhHESi +ZyUAoMiCTWig3qaApv1DaE0BolnxhUDU +=l1wo -----END PGP SIGNATURE----- diff --git a/dev-cpp/libglademm/files/gcc34.patch b/dev-cpp/libglademm/files/gcc34.patch deleted file mode 100644 index f6143216f8dc..000000000000 --- a/dev-cpp/libglademm/files/gcc34.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN libglademm-2.4.0-old/examples/derived/deriveddialog.h libglademm-2.4.0-new/examples/derived/deriveddialog.h ---- libglademm-2.4.0/examples/derived/deriveddialog.h 2003-08-23 19:21:06.000000000 +0200 -+++ libglademm-2.4.0/examples/derived/deriveddialog.h 2004-05-22 14:11:18.354537344 +0200 -@@ -19,8 +19,8 @@ - #ifndef LIBGLADEMM_EXAMPLE_DERIVED_DIALOG_H - #define LIBGLADEMM_EXAMPLE_DERIVED_DIALOG_H - --#include <libglademm.h> - #include <gtkmm.h> -+#include <libglademm.h> - - - class DerivedDialog : public Gtk::Dialog diff --git a/dev-cpp/libglademm/files/libglademm-2.2.0-configure.patch b/dev-cpp/libglademm/files/libglademm-2.2.0-configure.patch deleted file mode 100644 index 4e84ba83f6e4..000000000000 --- a/dev-cpp/libglademm/files/libglademm-2.2.0-configure.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure 2004-03-29 12:22:40.000000000 -0500 -+++ b/configure 2004-11-01 20:00:49.914274904 -0500 -@@ -3634,7 +3634,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `"$LD" -v 2>&1 </dev/null` in -+case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -9990,7 +9990,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `"$LD" -v 2>&1 </dev/null` in -+case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; diff --git a/dev-cpp/libglademm/libglademm-2.0.1.ebuild b/dev-cpp/libglademm/libglademm-2.0.1.ebuild deleted file mode 100644 index 8312aded5c37..000000000000 --- a/dev-cpp/libglademm/libglademm-2.0.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.0.1.ebuild,v 1.13 2008/07/10 15:20:06 remi Exp $ - -inherit gnome2 -IUSE="" -DESCRIPTION="C++ bindings for libglade" -HOMEPAGE="http://www.gtkmm.org" -SRC_URI="mirror://sourceforge/gtkmm/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="2" -KEYWORDS="amd64 hppa ~ia64 ppc sparc x86" - -RDEPEND=">=gnome-base/libglade-2 - =dev-cpp/gtkmm-2.2*" -DEPEND=">=dev-util/pkgconfig-0.12.0 - ${RDEPEND}" - -# Needed for 2.0.0, it misses some make/libtool magic -export SED=sed - -DOCS="AUTHORS COPYING ChangeLog NEWS README TODO INSTALL" diff --git a/dev-cpp/libglademm/libglademm-2.2.0.ebuild b/dev-cpp/libglademm/libglademm-2.2.0.ebuild deleted file mode 100644 index db5ac2e77e57..000000000000 --- a/dev-cpp/libglademm/libglademm-2.2.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.2.0.ebuild,v 1.14 2008/07/10 15:20:06 remi Exp $ - -inherit gnome2 eutils - -DESCRIPTION="C++ bindings for libglade" -HOMEPAGE="http://www.gtkmm.org" - -LICENSE="LGPL-2.1" -SLOT="2" -KEYWORDS="-amd64 ~hppa ppc ppc64 ~sparc x86" -IUSE="" - -RDEPEND=">=gnome-base/libglade-2 - =dev-cpp/gtkmm-2.2*" -DEPEND=">=dev-util/pkgconfig-0.12.0 - ${RDEPEND}" - -# Needed for 2.0.0, it misses some make/libtool magic -# export SED=sed - -DOCS="AUTHORS COPYING ChangeLog NEWS README TODO INSTALL" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/gcc34.patch - epatch "${FILESDIR}"/${P}-configure.patch -} diff --git a/dev-cpp/libglademm/libglademm-2.6.4.ebuild b/dev-cpp/libglademm/libglademm-2.6.4.ebuild index 2b1a183f7f6b..d0d42499c8b9 100644 --- a/dev-cpp/libglademm/libglademm-2.6.4.ebuild +++ b/dev-cpp/libglademm/libglademm-2.6.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild,v 1.11 2008/07/10 15:20:06 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.4.ebuild,v 1.12 2010/04/03 11:26:26 eva Exp $ inherit gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gtkmm.org" LICENSE="LGPL-2.1" SLOT="2.4" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" +KEYWORDS="arm ppc64 sh" IUSE="doc examples" RDEPEND=">=gnome-base/libglade-2.6.1 diff --git a/dev-cpp/libglademm/libglademm-2.6.7.ebuild b/dev-cpp/libglademm/libglademm-2.6.7.ebuild index 8123c98972ea..1ab83babb601 100644 --- a/dev-cpp/libglademm/libglademm-2.6.7.ebuild +++ b/dev-cpp/libglademm/libglademm-2.6.7.ebuild @@ -1,6 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild,v 1.1 2008/11/17 19:41:01 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild,v 1.2 2010/04/03 11:26:26 eva Exp $ + +EAPI="3" +GCONF_DEBUG="no" inherit gnome2 @@ -13,33 +16,31 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="doc examples" RDEPEND=">=gnome-base/libglade-2.6.1 - >=dev-cpp/gtkmm-2.6" + >=dev-cpp/gtkmm-2.6 + >=dev-cpp/glibmm-2.4" -DEPEND=">=dev-util/pkgconfig-0.12.0 - ${RDEPEND}" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.12" DOCS="AUTHORS ChangeLog NEWS README TODO" -src_unpack() { - gnome2_src_unpack +src_prepare() { + gnome2_src_prepare # we will control install manually in install - sed -i 's/^\(SUBDIRS =.*\)docs\(.*\)$/\1\2/' Makefile.in || \ - die "sed Makefile.in failed" + sed -i 's/^\(SUBDIRS =.*\)docs\(.*\)$/\1\2/' Makefile.am Makefile.in || \ + die "sed Makefile.{am,in} failed (1)" - if ! use examples; then - # don't waste time building the examples - sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \ - die "sed Makefile.in failed" - fi + # don't waste time building the examples + sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \ + Makefile.am Makefile.in || die "sed Makefile.{am,in} failed (2)" } src_compile() { gnome2_src_compile if use doc; then - cd "${S}/docs/reference" - make all + emake -C "${S}/docs/reference" all || die "emake doc failed" fi } @@ -47,10 +48,17 @@ src_install() { gnome2_src_install if use doc ; then - dohtml -r docs/reference/html/* + dohtml -r docs/reference/html/* || die "dohtml failed" fi if use examples; then - cp -R examples "${D}"/usr/share/doc/${PF} + emake -C "${S}/examples" distclean || die "examples clean up failed" + find "${S}/examples" -name "Makefile*" -delete \ + || "examples cleanup failed" + insinto "/usr/share/doc/${PF}" + doins -r examples || die "doins failed" fi + + # Does not install static library + find "${D}" -name "*.la" -delete || die "failed *.la removal" } |