diff options
| -rw-r--r-- | media-libs/wxsvg/wxsvg-1.0.ebuild | 19 | ||||
| -rw-r--r-- | media-libs/wxsvg/wxsvg-1.0_beta7.ebuild | 48 |
2 files changed, 7 insertions, 60 deletions
diff --git a/media-libs/wxsvg/wxsvg-1.0.ebuild b/media-libs/wxsvg/wxsvg-1.0.ebuild index 5bc746905ac6..997a4699f232 100644 --- a/media-libs/wxsvg/wxsvg-1.0.ebuild +++ b/media-libs/wxsvg/wxsvg-1.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0.ebuild,v 1.3 2009/08/09 13:51:19 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0.ebuild,v 1.4 2009/08/17 14:23:41 ssuominen Exp $ +EAPI=2 WX_GTK_VER="2.8" - inherit autotools wxwidgets DESCRIPTION="C++ library to create, manipulate and render SVG files." @@ -11,8 +11,8 @@ HOMEPAGE="http://wxsvg.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="wxWinLL-3" -KEYWORDS="amd64 ppc x86" SLOT="0" +KEYWORDS="amd64 ppc x86" IUSE="ffmpeg" RDEPEND="=x11-libs/wxGTK-2.8* @@ -26,18 +26,13 @@ RDEPEND="=x11-libs/wxGTK-2.8* DEPEND="${RDEPEND} dev-util/pkgconfig" -src_unpack() { - unpack ${A} - cd "${S}" - -# epatch "${FILESDIR}"/${P}-new-ffmpeg-headers.patch - +src_prepare() { AT_M4DIR="${S}" eautoreconf } -src_compile() { - econf --with-wx-config="${WXCONFIG}" || die "econf failed" - emake || die "emake failed" +src_configure() { + econf \ + --with-wx-config="${WXCONFIG}" } src_install() { diff --git a/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild b/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild deleted file mode 100644 index 88a6887b7b46..000000000000 --- a/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.0_beta7.ebuild,v 1.7 2008/05/19 07:04:35 drac Exp $ - -inherit eutils wxwidgets - -MY_PV=${PV/_beta/b} - -DESCRIPTION="C++ library to create, manipulate and render SVG files." -HOMEPAGE="http://wxsvg.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}_1.tar.gz" - -LICENSE="wxWinLL-3" -KEYWORDS="~amd64 ~ppc x86" -SLOT="0" -IUSE="" - -RDEPEND="=x11-libs/wxGTK-2.6* - >=dev-libs/glib-2.12 - >=dev-libs/libxml2-2.6.26 - >=media-libs/fontconfig-2.4 - >=media-libs/freetype-2.2.0 - >=media-libs/libart_lgpl-2.3.17 - >=x11-libs/pango-1.14.9" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${PN}-${MY_PV} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-freetype.patch -} - -src_compile() { - export WX_GTK_VER="2.6" - need-wxwidgets gtk2 - myconf="${myconf} --with-wx-config=${WX_CONFIG}" - - econf ${myconf} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog TODO -} |