diff options
| -rw-r--r-- | x11-libs/hippo-canvas/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/hippo-canvas/Manifest | 7 | ||||
| -rw-r--r-- | x11-libs/hippo-canvas/files/hippo-canvas-0.2.23-use-python.patch | 60 | ||||
| -rw-r--r-- | x11-libs/hippo-canvas/hippo-canvas-0.2.25.ebuild (renamed from x11-libs/hippo-canvas/hippo-canvas-0.2.23.ebuild) | 16 |
4 files changed, 12 insertions, 78 deletions
diff --git a/x11-libs/hippo-canvas/ChangeLog b/x11-libs/hippo-canvas/ChangeLog index f6821a9ef..7cc9a1b77 100644 --- a/x11-libs/hippo-canvas/ChangeLog +++ b/x11-libs/hippo-canvas/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for x11-libs/hippo-canvas -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Feb 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com> + -files/hippo-canvas-0.2.23-use-python.patch, -hippo-canvas-0.2.23.ebuild, + +hippo-canvas-0.2.25.ebuild: + Version bump. Re-enabling USE=doc because eautoreconf is no longer needed. + 05 Sep 2007; Jakub Moc <jakub@gentoo.org> hippo-canvas-0.2.23.ebuild: Get rid of unwanted debug USE flag diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest index cdfcab9f3..81347bfb5 100644 --- a/x11-libs/hippo-canvas/Manifest +++ b/x11-libs/hippo-canvas/Manifest @@ -1,5 +1,4 @@ -AUX hippo-canvas-0.2.23-use-python.patch 2123 RMD160 48563c557ff3725bc78195048a392b36a32ae413 SHA1 c819b1df158dee82b4571befde2a967e07a918be SHA256 a031a82e0faf45d2453316b18f2fa755b229f5ed9af59a46ad02789d8ff223b6 -DIST hippo-canvas-0.2.23.tar.bz2 332846 RMD160 179728e4c639769330db6804f6ff56b510d3e3b6 SHA1 a538dc5a71df94e86d998a106f1415799528177b SHA256 fd4ddd8d02fc925da332c193f1d31965d53798aac87d568daa97cc48c6cfe2fe -EBUILD hippo-canvas-0.2.23.ebuild 849 RMD160 8270a19baf3b694905010d574f7ae07c4698fac8 SHA1 1bb017f0314adcd1f1d2d456c491465afdebb173 SHA256 595de47356e411799bb0f388a94f986948116a0018387bc9f9e07e940dc3071d -MISC ChangeLog 619 RMD160 bc2aeeab2b4afb418cace3d6c727199cc42a0835 SHA1 c3a0955ef7db1ec4650945a0c5446bafed0f044f SHA256 e4b0280e492af45887349ea11c08099be2861a2f8d2c834c067b66ca39649f06 +DIST hippo-canvas-0.2.25.tar.bz2 348939 RMD160 7132f869e8f3c231ffd5d03d73392cd3b67f3fca SHA1 258dd4423aba70bf92c3307374b868c3d06e203f SHA256 17b8e2a545944467ee54f420913096b121d6730ff1cc92d64b4a14d1fabf1632 +EBUILD hippo-canvas-0.2.25.ebuild 616 RMD160 0dc5434d5054e738ae09070b3d39df80e1e37d0d SHA1 9239ea61ca037d4198a7ced81f01b08f77fb9f41 SHA256 8279545729e9495c6f6c0b7b138da59b4fe4dac3de714beca33f4940e2cb83ec +MISC ChangeLog 874 RMD160 1f1ebfe5b9ab6a0d4854f17c0829093771441203 SHA1 bad711dfb299a61e8cf6424fdbdb26c95364d5e1 SHA256 9b3a2b4d69dc1ad81505a9f63521878b3bcf593764d0a7457be7578cb736c423 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/x11-libs/hippo-canvas/files/hippo-canvas-0.2.23-use-python.patch b/x11-libs/hippo-canvas/files/hippo-canvas-0.2.23-use-python.patch deleted file mode 100644 index 1eaacfa2e..000000000 --- a/x11-libs/hippo-canvas/files/hippo-canvas-0.2.23-use-python.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -ru hippo-canvas-0.2.23-orig/configure.ac hippo-canvas-0.2.23/configure.ac ---- hippo-canvas-0.2.23-orig/configure.ac 2007-07-11 16:47:11.000000000 -0400 -+++ hippo-canvas-0.2.23/configure.ac 2007-08-30 20:33:58.924749555 -0400 -@@ -154,15 +154,28 @@ - GTK_DOC_CHECK([1.6]) - - ## Python bindings --AM_PATH_PYTHON --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+AC_ARG_ENABLE(python, -+ [AC_HELP_STRING([--enable-python], [build python bindings [default=auto]])]) -+if test "x$enable_python" = "xno" ; then -+ have_python=no -+else -+ have_python=no -+ AM_PATH_PYTHON -+ if test "x$PYTHON" = "x" ; then -+ AC_MSG_WARN([Python not found]) -+ else -+ AM_CHECK_PYTHON_HEADERS([ -+ AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) -+ PKG_CHECK_MODULES(PYTHON_BINDINGS, pygtk-2.0 pycairo, [ -+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -+ AC_SUBST(PYGTK_DEFSDIR) -+ have_python=yes -+ ], [AC_MSG_WARN(could not find pygtk-2.0 or pycairo)]) -+ ],[AC_MSG_WARN(could not find Python headers)]) -+ fi -+fi - --AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) -- --PKG_CHECK_MODULES(PYTHON_BINDINGS, pygtk-2.0 pycairo) -- --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFSDIR) -+AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes") - - AC_OUTPUT([ - Makefile -@@ -179,6 +192,7 @@ - prefix: ${prefix} - compiler: ${CC} - LIBHIPPOCANVAS_CFLAGS: ${LIBHIPPOCANVAS_CFLAGS} -+ build python bindings: ${have_python} - - Now type 'make' to build $PACKAGE - " -diff -ru hippo-canvas-0.2.23-orig/Makefile.am hippo-canvas-0.2.23/Makefile.am ---- hippo-canvas-0.2.23-orig/Makefile.am 2007-07-08 06:28:19.000000000 -0400 -+++ hippo-canvas-0.2.23/Makefile.am 2007-08-30 20:34:06.286626454 -0400 -@@ -54,6 +54,8 @@ - libhippocanvas_1_la_SOURCES=$(COMMON_CANVAS_SOURCEFILES) $(LINUX_CANVAS_SOURCEFILES) - nodist_libhippocanvas_1_la_SOURCES=$(CANVAS_BUILT_SOURCEFILES) - -+if HAVE_PYTHON - include Makefile-python.am -+endif - - DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.2.23.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.2.25.ebuild index cd7dd0789..ce365ed29 100644 --- a/x11-libs/hippo-canvas/hippo-canvas-0.2.23.ebuild +++ b/x11-libs/hippo-canvas/hippo-canvas-0.2.25.ebuild @@ -3,7 +3,7 @@ # $Header: $ GCONF_DEBUG="no" -inherit autotools gnome2 eutils +inherit gnome2 DESCRIPTION="A canvas library based on GTK+-2, Cairo, and Pango" HOMEPAGE="http://developer.mugshot.org/wiki/Hippo_Canvas" @@ -12,9 +12,7 @@ LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -# Removed USE=doc for now since configure.ac needs fixing -# otherwise eautoreconf fails -IUSE="python" # doc +IUSE="doc python" RDEPEND=">=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6 @@ -23,18 +21,10 @@ RDEPEND=">=dev-libs/glib-2.6 dev-python/pygtk )" DEPEND="${RDEPEND} dev-util/pkgconfig - >=dev-util/gtk-doc-1.6" - # doc? ( >=dev-util/gtk-doc-1.6 )" + doc? ( >=dev-util/gtk-doc-1.6 )" DOCS="AUTHORS README TODO" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-use-python.patch" - eautoreconf -} - pkg_setup() { G2CONF="$(use_enable python)" } |