* [gentoo-commits] gentoo-x86 commit in app-mobilephone/heimdall: ChangeLog heimdall-9999.ebuild
@ 2014-12-17 9:07 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler (polynomial-c) @ 2014-12-17 9:07 UTC (permalink / raw
To: gentoo-commits
polynomial-c 14/12/17 09:07:29
Modified: ChangeLog heimdall-9999.ebuild
Log:
Fixed removal of libusb (bug #532756)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Revision Changes Path
1.10 app-mobilephone/heimdall/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 2 Jun 2014 22:45:10 -0000 1.9
+++ ChangeLog 17 Dec 2014 09:07:29 -0000 1.10
@@ -1,6 +1,9 @@
# ChangeLog for app-mobilephone/heimdall
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v 1.9 2014/06/02 22:45:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v 1.10 2014/12/17 09:07:29 polynomial-c Exp $
+
+ 17 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> heimdall-9999.ebuild:
+ Fixed removal of libusb (bug #532756).
*heimdall-1.4.1 (02 Jun 2014)
1.7 app-mobilephone/heimdall/heimdall-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild?r1=1.6&r2=1.7
Index: heimdall-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- heimdall-9999.ebuild 24 Mar 2014 17:48:11 -0000 1.6
+++ heimdall-9999.ebuild 17 Dec 2014 09:07:29 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v 1.6 2014/03/24 17:48:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v 1.7 2014/12/17 09:07:29 polynomial-c Exp $
EAPI=5
@@ -30,7 +30,7 @@
virtual/pkgconfig"
src_prepare() {
- rm -r libusbx-1.0 || die
+ rm -r libusb-1.0 || die
cd "${S}/heimdall" || die
edos2unix configure.ac Makefile.am || die
sed -i -e /sudo/d Makefile.am || die
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-mobilephone/heimdall: ChangeLog heimdall-9999.ebuild
@ 2015-07-16 8:59 Lars Wendler (polynomial-c)
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler (polynomial-c) @ 2015-07-16 8:59 UTC (permalink / raw
To: gentoo-commits
polynomial-c 15/07/16 08:59:06
Modified: ChangeLog heimdall-9999.ebuild
Log:
Fixed live ebuild (bug #545596)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 981CA6FC)
Revision Changes Path
1.12 app-mobilephone/heimdall/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 7 Jun 2015 08:08:11 -0000 1.11
+++ ChangeLog 16 Jul 2015 08:59:06 -0000 1.12
@@ -1,6 +1,9 @@
# ChangeLog for app-mobilephone/heimdall
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v 1.11 2015/06/07 08:08:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/ChangeLog,v 1.12 2015/07/16 08:59:06 polynomial-c Exp $
+
+ 16 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> heimdall-9999.ebuild:
+ Fixed live ebuild (bug #545596).
07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Add github to remote-id in metadata.xml
1.8 app-mobilephone/heimdall/heimdall-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild?r1=1.7&r2=1.8
Index: heimdall-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- heimdall-9999.ebuild 17 Dec 2014 09:07:29 -0000 1.7
+++ heimdall-9999.ebuild 16 Jul 2015 08:59:06 -0000 1.8
@@ -1,10 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v 1.7 2014/12/17 09:07:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/heimdall/heimdall-9999.ebuild,v 1.8 2015/07/16 08:59:06 polynomial-c Exp $
EAPI=5
-inherit autotools eutils qt4-r2 udev
+CMAKE_IN_SOURCE_BUILD="true"
+
+inherit autotools eutils cmake-utils udev
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -21,43 +23,36 @@
LICENSE="MIT"
SLOT="0"
-IUSE="qt4"
+IUSE="qt5 static-libs"
# virtual/libusb is not precise enough
-RDEPEND=">=dev-libs/libusb-1.0.18:1=
- qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= )"
+RDEPEND=">=dev-libs/libusb-1.0.18:1=[static-libs=]
+ qt5? ( dev-qt/qtwidgets:5= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- rm -r libusb-1.0 || die
- cd "${S}/heimdall" || die
- edos2unix configure.ac Makefile.am || die
- sed -i -e /sudo/d Makefile.am || die
- eautoreconf
+ if ! use qt5 ; then
+ sed '/heimdall-frontend/d' \
+ -i CMakeLists.txt || die
+ fi
}
src_configure() {
- cd "${S}/libpit" || die
- econf
-
- cd "${S}/heimdall" || die
- econf
-
- if use qt4; then
- cd "${S}/heimdall-frontend" || die
- eqmake4 heimdall-frontend.pro OUTPUTDIR=/usr/bin || die
- fi
+ cmake-utils_src_configure \
+ $(cmake-utils_use_use static-libs STATIC_LIBS)
}
src_compile() {
- emake -C libpit
- emake -C heimdall
- use qt4 && emake -C heimdall-frontend
+ cmake-utils_src_compile
}
src_install() {
- emake -C heimdall DESTDIR="${D}" udevrulesdir="$(get_udevdir)/rules.d" install
+ # cmake-utils_src_install doesn't work
+ dobin "${S}"/bin/${PN}
+ use qt5 && dobin "${S}"/bin/${PN}-frontend
+
+ insinto $(get_udevdir)/rules.d
+ doins "${S}"/${PN}/60-${PN}.rules
dodoc Linux/README
- use qt4 && emake -C heimdall-frontend INSTALL_ROOT="${D}" install
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-16 8:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-17 9:07 [gentoo-commits] gentoo-x86 commit in app-mobilephone/heimdall: ChangeLog heimdall-9999.ebuild Lars Wendler (polynomial-c)
-- strict thread matches above, loose matches on Subject: below --
2015-07-16 8:59 Lars Wendler (polynomial-c)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox