summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-05-27 13:33:11 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-05-27 13:33:11 +0000
commit48cdeb07cbcc7e69fd0ca618cb6bb312bd8e963e (patch)
tree87e90f8e1999f79df9b45443440fb14591e7a042 /app-admin
parentarm stable, bug #416333 (diff)
downloadgentoo-2-48cdeb07cbcc7e69fd0ca618cb6bb312bd8e963e.tar.gz
gentoo-2-48cdeb07cbcc7e69fd0ca618cb6bb312bd8e963e.tar.bz2
gentoo-2-48cdeb07cbcc7e69fd0ca618cb6bb312bd8e963e.zip
version bump
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/hardinfo/ChangeLog9
-rw-r--r--app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch53
-rw-r--r--app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild34
3 files changed, 95 insertions, 1 deletions
diff --git a/app-admin/hardinfo/ChangeLog b/app-admin/hardinfo/ChangeLog
index cecef5b3ade1..88467183bafc 100644
--- a/app-admin/hardinfo/ChangeLog
+++ b/app-admin/hardinfo/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-admin/hardinfo
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/ChangeLog,v 1.1 2012/05/26 21:46:09 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/ChangeLog,v 1.2 2012/05/27 13:33:10 hasufell Exp $
+
+*hardinfo-0.5.2_pre20120527 (27 May 2012)
+
+ 27 May 2012; Julian Ospald <hasufell@gentoo.org>
+ +hardinfo-0.5.2_pre20120527.ebuild,
+ +files/hardinfo-0.5.2_pre20120527-build.patch:
+ version bump
*hardinfo-0.5.1 (26 May 2012)
diff --git a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
new file mode 100644
index 000000000000..76718a38ebd8
--- /dev/null
+++ b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
@@ -0,0 +1,53 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat May 26 01:30:39 UTC 2012
+Subject: build system
+
+use GNUInstallDirs and respect lib suffix
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -3,6 +3,8 @@
+
+ set(HARDINFO_VERSION "0.5.2pre")
+
++include(GNUInstallDirs)
++
+ if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
+ set(HARDINFO_DEBUG 1)
+ endif()
+@@ -179,8 +181,8 @@
+ configure_file(hardinfo.desktop.cmake ${CMAKE_BINARY_DIR}/hardinfo.desktop @ONLY)
+
+ install(TARGETS hardinfo ${HARDINFO_MODULES}
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib/hardinfo/modules
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hardinfo/modules
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/hardinfo.desktop
+@@ -201,4 +203,4 @@
+ PATTERN "*.{hlp,png}"
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ )
+-
+\ No newline at end of file
++
+--- config.h.cmake
++++ config.h.cmake
+@@ -10,7 +10,7 @@
+ #define HOSTNAME ""
+ #define ARCH_@HARDINFO_ARCH@
+
+-#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/lib/hardinfo"
++#define LIBPREFIX "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo"
+ #define PREFIX "@CMAKE_INSTALL_PREFIX@/share/hardinfo"
+
+ #cmakedefine LIBSOUP_FOUND
+@@ -32,4 +32,4 @@
+ #define ENABLE_BINRELOC 1
+ #define HAS_LINUX_WE 1
+
+-#endif /* __CONFIG_H__ */
+\ No newline at end of file
++#endif /* __CONFIG_H__ */
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild
new file mode 100644
index 000000000000..4610ac60c61c
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild,v 1.1 2012/05/27 13:33:10 hasufell Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="A system information and benchmark tool for Linux systems"
+HOMEPAGE="http://hardinfo.berlios.de/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ net-libs/libsoup
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+
+ if use amd64; then
+ sed \
+ -e 's/g_build_filename(prefix, "lib"/g_build_filename(prefix, "'$(get_libdir)'"/' \
+ -i hardinfo/binreloc.c || die
+ fi
+}