From 8255b6b40fd3c411505619c2125caa1704010a69 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Thu, 30 Aug 2012 22:47:22 +0000
Subject: Sync to the live ebuild, and fix build issues with gold linker.

(Portage version: 2.2.0_alpha120_p33/cvs/Linux x86_64)
---
 app-cdr/mirage2iso/ChangeLog               |  7 +++++--
 app-cdr/mirage2iso/metadata.xml            |  2 +-
 app-cdr/mirage2iso/mirage2iso-0.3.1.ebuild | 20 ++++++++++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'app-cdr/mirage2iso')

diff --git a/app-cdr/mirage2iso/ChangeLog b/app-cdr/mirage2iso/ChangeLog
index 6ec33d33a5f9..de39ada022c3 100644
--- a/app-cdr/mirage2iso/ChangeLog
+++ b/app-cdr/mirage2iso/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/mirage2iso
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/mirage2iso/ChangeLog,v 1.4 2012/04/24 09:24:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/mirage2iso/ChangeLog,v 1.5 2012/08/30 22:47:22 mgorny Exp $
+
+  30 Aug 2012; Michał Górny <mgorny@gentoo.org> metadata.xml,
+  mirage2iso-0.3.1.ebuild:
+  Sync to the live ebuild, and fix build issues with gold linker.
 
   24 Apr 2012; Michał Górny <mgorny@gentoo.org> mirage2iso-0.3.1.ebuild:
   Update to use mirror://.
@@ -17,4 +21,3 @@
   +metadata.xml:
   New ebuild for mirage2iso CD/DVD image converter, as requested in bug
   #283565.
-
diff --git a/app-cdr/mirage2iso/metadata.xml b/app-cdr/mirage2iso/metadata.xml
index 250ea7037c62..96b6be2e686b 100644
--- a/app-cdr/mirage2iso/metadata.xml
+++ b/app-cdr/mirage2iso/metadata.xml
@@ -14,6 +14,6 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>http://bugs.gentoo.org/enter_bug.cgi?product=Gentoo%20Linux&amp;component=Applications&amp;short_desc=app-cdr/mirage2iso:%20</bugs-to>
+		<bugs-to>https://bitbucket.org/mgorny/mirage2iso/issues/</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-cdr/mirage2iso/mirage2iso-0.3.1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.3.1.ebuild
index 20391d5eb78f..84aa039878dc 100644
--- a/app-cdr/mirage2iso/mirage2iso-0.3.1.ebuild
+++ b/app-cdr/mirage2iso/mirage2iso-0.3.1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/mirage2iso/mirage2iso-0.3.1.ebuild,v 1.5 2012/04/24 09:24:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/mirage2iso/mirage2iso-0.3.1.ebuild,v 1.6 2012/08/30 22:47:22 mgorny Exp $
 
-EAPI=3
-inherit autotools-utils versionator
+EAPI=4
+
+inherit autotools-utils toolchain-funcs versionator
 
 TESTS_PV=$(get_version_component_range 1-2)
 
 DESCRIPTION="CD/DVD image converter using libmirage"
-HOMEPAGE="https://github.com/mgorny/mirage2iso/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2
-	test? ( mirror://github/mgorny/${PN}/${PN}-${TESTS_PV}-tests.tar.xz )"
+HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2
+	test? ( mirror://bitbucket/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )"
 
 LICENSE="BSD"
 SLOT="0"
@@ -21,6 +22,7 @@ COMMON_DEPEND="dev-libs/libmirage
 	dev-libs/glib:2
 	pinentry? ( dev-libs/libassuan )"
 DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
 	test? ( app-arch/xz-utils )"
 RDEPEND="${COMMON_DEPEND}
 	pinentry? ( app-crypt/pinentry )"
@@ -28,8 +30,14 @@ RDEPEND="${COMMON_DEPEND}
 DOCS=( NEWS README )
 
 src_configure() {
+	local pkgconf=$(tc-getPKG_CONFIG)
+
 	myeconfargs=(
 		$(use_with pinentry libassuan)
+
+		# ai, upstream missed it
+		CFLAGS="${CFLAGS} $(${pkgconf} --cflags gobject-2.0)"
+		LIBS="${LIBS} $(${pkgconf} --libs gobject-2.0)"
 	)
 
 	autotools-utils_src_configure
-- 
cgit v1.2.3-65-gdbad