Fixing the default autopano executable. This ebuild also gets rid of the gtk2 useflag

(Portage version: 2.0.53_rc5)

6 files changed, 22 insertions, 78 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index fb9adcebdc4c..f5fe30c84208 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.5 2005/10/01 20:11:13 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.6 2005/10/16 02:23:49 halcy0n Exp $
+
+*hugin-0.5_rc1-r2 (16 Oct 2005)
+
+  16 Oct 2005; Mark Loeser <halcy0n@gentoo.org> -hugin-0.5_rc1.ebuild,
+  -hugin-0.5_rc1-r1.ebuild, +hugin-0.5_rc1-r2.ebuild:
+  Fixing the default autopano executable.  This ebuild also gets rid of the gtk2
+  useflag
 
 *hugin-0.5_rc2 (01 Oct 2005)
 *hugin-0.5_rc1-r1 (01 Oct 2005)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 4d24ab2fd93e..077f0021b0d8 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3aada7856650aa993b3d9ef29028205c ChangeLog 929
-MD5 a55ec4c60a26b13c55062ed165600b90 hugin-0.5_rc2.ebuild 1485
-MD5 958a93f482686868d880a8b448d0899d metadata.xml 324
-MD5 2c712bad6511405afc276de557f88e06 hugin-0.5_rc1-r1.ebuild 1368
-MD5 fc8fe0e9c2ff87b050797aa0e41cdfd7 hugin-0.5_rc1.ebuild 1570
 MD5 549db5b9b4146eb8aff8a35d39eabf1e files/digest-hugin-0.5_rc1 67
-MD5 fca5e4ab4e2444d69d18b311f6a5591f files/digest-hugin-0.5_rc2 67
 MD5 549db5b9b4146eb8aff8a35d39eabf1e files/digest-hugin-0.5_rc1-r1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPu1/CRZPokWLroQRAkgBAJ9tM2yVOVw58q2F8W4gmC5tmzO+qACdHrWI
-oAJKE+qLhAzt6tvVvEUlzyk=
-=AJXP
------END PGP SIGNATURE-----
+MD5 549db5b9b4146eb8aff8a35d39eabf1e files/digest-hugin-0.5_rc1-r2 67
+MD5 fca5e4ab4e2444d69d18b311f6a5591f files/digest-hugin-0.5_rc2 67
+MD5 6acd6910635c9d614907f1f6af3b1761 hugin-0.5_rc1-r2.ebuild 1483
+MD5 fc8fe0e9c2ff87b050797aa0e41cdfd7 hugin-0.5_rc1.ebuild 1570
+MD5 a55ec4c60a26b13c55062ed165600b90 hugin-0.5_rc2.ebuild 1485
+MD5 958a93f482686868d880a8b448d0899d metadata.xml 324
diff --git a/media-gfx/hugin/files/digest-hugin-0.5_rc1-r1 b/media-gfx/hugin/files/digest-hugin-0.5_rc1-r1
deleted file mode 100644
index a4721551b398..000000000000
--- a/media-gfx/hugin/files/digest-hugin-0.5_rc1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82fcd91f437b375438bee6f51352c777 hugin-0.5_rc1.tar.bz2 1499912
diff --git a/media-gfx/hugin/files/digest-hugin-0.5_rc1 b/media-gfx/hugin/files/digest-hugin-0.5_rc1-r2
index a4721551b398..a4721551b398 100644
--- a/media-gfx/hugin/files/digest-hugin-0.5_rc1
+++ b/media-gfx/hugin/files/digest-hugin-0.5_rc1-r2
diff --git a/media-gfx/hugin/hugin-0.5_rc1-r1.ebuild b/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild
index 48c566974b50..ec769809d308 100644
--- a/media-gfx/hugin/hugin-0.5_rc1-r1.ebuild
+++ b/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.5_rc1-r1.ebuild,v 1.1 2005/10/01 20:11:13 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.5_rc1-r2.ebuild,v 1.1 2005/10/16 02:23:49 halcy0n Exp $
 
 inherit wxwidgets
 
@@ -10,7 +10,7 @@ MY_P=${P/_rc*//}
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2 SIFT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="unicode debug"
 
 DEPEND=">=media-libs/libpano12-2.7.0.8
@@ -23,6 +23,12 @@ DEPEND=">=media-libs/libpano12-2.7.0.8
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e 's/autopanog\.exe/autopanog/' "${S}"/src/include/hugin/config_defaults.h
+}
+
 src_compile() {
 	export WX_GTK_VER="2.6"
 
diff --git a/media-gfx/hugin/hugin-0.5_rc1.ebuild b/media-gfx/hugin/hugin-0.5_rc1.ebuild
deleted file mode 100644
index e5d8dda34e3d..000000000000
--- a/media-gfx/hugin/hugin-0.5_rc1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.5_rc1.ebuild,v 1.5 2005/09/16 06:46:01 halcy0n Exp $
-
-inherit wxwidgets
-
-DESCRIPTION="GUI for the creation & processing of panoramic images"
-HOMEPAGE="http://hugin.sf.net"
-MY_P=${P/_rc*//}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2 SIFT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="gtk2 unicode debug"
-
-DEPEND=">=media-libs/libpano12-2.7.0.8
-		>=dev-libs/boost-1.30.0
-		>=x11-libs/wxGTK-2.6.0
-		sys-libs/zlib
-		media-libs/libpng
-		media-libs/jpeg
-		media-libs/tiff"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use unicode && ! use gtk2; then
-		die "You must put gtk2 in your USE if you want unicode."
-	fi
-}
-
-src_compile() {
-	export WX_GTK_VER="2.6"
-
-	if use unicode; then
-		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
-	elif ! use gtk2; then
-		need-wxwidgets gtk || die "Emerge wxGTK with wxgtk1 in USE"
-	else
-		need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE"
-	fi
-
-	myconf="`use_with unicode`
-			`use_enable debug`"
-
-	econf --with-wx-config="${WX_CONFIG}" ${myconf} || die "configure failed"
-	emake || die "compiling failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc AUTHORS BUGS INSTALL LICENCE LICENCE_SIFT README TODO
-}
-
-pkg_postinst() {
-	einfo "Please consider the helper apps autopano-sift and enblend."
-	einfo "autopano-sift is used to automagically generate control"
-	einfo "points and enblend is used to merge images smoothly."
-}