dev-util/lttng-modules: bump to 2.1.1, convert to linux-mod, #431358

4 files changed, 94 insertions, 10 deletions

diff --git a/dev-util/lttng-modules/ChangeLog b/dev-util/lttng-modules/ChangeLog
index 1ae07e270..88d0a4322 100644
--- a/dev-util/lttng-modules/ChangeLog
+++ b/dev-util/lttng-modules/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-util/lttng-modules
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lttng-modules-2.1.1 (19 Mar 2013)
+
+  19 Mar 2013; Lan Yixun (dlan) <dennis.yxun@gmail.com>
+  +lttng-modules-2.1.1.ebuild, lttng-modules-9999.ebuild:
+  bump to 2.1.1, convert to linux-mod, #431358
+
 *lttng-modules-9999 (16 Aug 2012)
 *lttng-modules-2.0.4 (16 Aug 2012)
 
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 661485910..120636867 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,5 +1,7 @@
 DIST lttng-modules-2.0.4.tar.bz2 138812 SHA256 f00116c388289192774c774581a651832be094aeb6da2f2c0f9c9e275fed2d14 SHA512 84778e8b3cf2032c78fc84aa1b2118be236167ad2e2605303d4b49a026f53ed7ea9427aae65dc99c7001f896f3de87fc87575e5ddcf1724aa7b6f8c0bd4071f6 WHIRLPOOL a92e2c05ff059d4397e2c428115a67768751b517918ac3323bfcc82205b2af896d0f0e3bb477d58ea849ce0bd76582655599c3a6573d4971934a33b38c9ab45b
+DIST lttng-modules-2.1.1.tar.bz2 168867 SHA256 515f365292b4b8a4074b3e4261d8e39c5ed919bf443a5c3c072ea380061552bc SHA512 bcacc078b64dc7d47aa4e694931624c1fa50b55f44cbcc9051ebba7863f4229294e00eff5c22684699c4194ba8e51d2279404eb46dc24f14e721ed9f801e5495 WHIRLPOOL 5f8f108f435f4f22a70ebbd8e740e1ba1b0c453a5c4e40bdbd4991518784ae5850899d93ef683a8e5bf056e5b16fdefe6f70cf197fa9f9953e752327a8616caf
 EBUILD lttng-modules-2.0.4.ebuild 707 SHA256 972f9f92160c971beed8abc87574db42a96545047d5db3b7a874c2b1d09bdebb SHA512 7e860658c986a6e5f35912f6dfabe0343b8321ebd9b519b1e384b282a1db1f0510a4fe1dfe68dbbd2488f70cfa7f5537c45d0193ea8edd78480bccb1a5f246df WHIRLPOOL 58285fb81e404dd466d1d987126e822dc04d77b8ab37b15540037e50c2c4d5bddf420c04fa0a1e5fdff7d3c55c1a4bc1ead992185629423d02d4e9fbdbdcd9e2
-EBUILD lttng-modules-9999.ebuild 703 SHA256 09ab11245d537dced0b1ad12a47d8ae0eea5307d6d0cf315ebfbf04aae593fea SHA512 3844f28d4700f9050c4d5f4107b6f82c09f5ef44744fd26c4a1e63323d75e553e521cc4b7ca3987989908abfaaab5650c575c40912167c039aaee2ad40be66db WHIRLPOOL deb6e3acc264ee5bb028251bf8ba9daf0b42b7b4e2cd3aecd96f8fefc16b72d28d08b09e186b5eca5a5d60810a96bb05e913ef418009097179910fd850011303
-MISC ChangeLog 382 SHA256 7a8191a45e36c0096e30c69c2eea59c027889781a1488113dbbcac86c7de5ce1 SHA512 1cbfb3bfdbd21db0fa850d31dcf5df8d04346e9f488da3dce91abe3e350f919449aa542759fb6ef830e77de5f9b61a5b7e67c5d6211983c2c6b61a1a3f97db3e WHIRLPOOL eb2028955e71f06ad2c9dbc4d3a8c759ed648c7d2e48a428a4456b1adcddd104dd7d4ab73c7340464765cdf1e4429417a16e7c882887670034032cbb4e9a4192
+EBUILD lttng-modules-2.1.1.ebuild 1381 SHA256 2c464bcb7f79369fa42120dbd56f163e07566410f02d122ae42c5d9834d965af SHA512 7f4c27ef541e0b0d5c2ddd7046e5fad8909a859c843b5906a6261cfaf3a146b2577951bce422586128e18e9ce08c6409c7ac1c67c922dcab0fdc166559b7836c WHIRLPOOL 590da5a43e9558229502dbb3ff59ea81efa262025b6d3888aadc23020fec5859ac9e8bcf99f99bac59fc07f2b987fa91e540f1884c09d3411247badcd7ce28bd
+EBUILD lttng-modules-9999.ebuild 1370 SHA256 8ab6c494448757a49c630a0e93b4d7ee9253b060f9c2bdf64ad7b1508da1eb6d SHA512 7d2cbf0af432360ffcbd8918c589ef09c34f59d9b897175b44ac974271467e5cce610e4de2ba40e51a39b9fb62e2d2d2272ae71127d30fa1aa36320c94219a1b WHIRLPOOL 4ffc7fd712c9317bd3f1b09d6843ac018dab69c52ad03d11f6fb9330db1d2d9149ef47e60a22df2beb4507937702e5b776471b620172667c0dca070e62ccf4d8
+MISC ChangeLog 580 SHA256 c47bb5f4d9dc945ec850c0025b4cf595fc1024c42a06aa0b8a26f45821cab3c8 SHA512 c3ef1380e9fce37e7fb878f047b4f1abe5ecd60d2779506410364bc49615f3091babb07871813010f981bd63c3682606ac47f92f29b88fab301f06537274721d WHIRLPOOL f4d8234854241c42a1564611060097559e23c0c5ad51128750b344de180368df6936e6c1daba953f79717989cac28531a6e74b66a1bd048d2e5412284d92ba20
 MISC metadata.xml 668 SHA256 953303211d7288b8a261c323964205bf8c37280456f54a44ab1dd61bff68c2a9 SHA512 248b818483bfc1c96fced2351cd9729219562973f6310768663ce6f91bc4fcd8a9bba1b7891caf490531683125589fc4fabe4a64392794c954a319a1745a197a WHIRLPOOL eb0ba226afdd15a159cc736bb9c1a9bb279c4efa11b08ed8f9ef4789e1850492786e99bd5effb7d28f3316f3cbc1ecd1cd84bb28592fdc4b1cf50ed1b1e07dd3
diff --git a/dev-util/lttng-modules/lttng-modules-2.1.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.1.1.ebuild
new file mode 100644
index 000000000..f0ac07847
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit linux-mod
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="http://lttng.org"
+SRC_URI="http://lttng.org/files/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+MODULE_NAMES="
+	lttng-ring-buffer-client-discard(misc:)
+	lttng-ring-buffer-client-overwrite(misc:)
+	lttng-ring-buffer-metadata-client(misc:)
+	lttng-ring-buffer-client-mmap-discard(misc:)
+	lttng-ring-buffer-client-mmap-overwrite(misc:)
+	lttng-ring-buffer-metadata-mmap-client(misc:)
+	lttng-tracer(misc:)
+	lttng-statedump(misc:)
+	probes/lttng-probe-statedump(misc:)
+	probes/lttng-types(misc:)
+	probes/lttng-probe-timer(misc:)
+	probes/lttng-probe-sched(misc:)
+	probes/lttng-probe-signal(misc:)
+	probes/lttng-probe-lttng(misc:)
+	probes/lttng-probe-irq(misc:)
+	probes/lttng-kretprobes(misc:)
+	probes/lttng-probe-block(misc:)
+	probes/lttng-kprobes(misc:)
+	lib/lttng-lib-ring-buffer(misc:)
+"
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+pkg_pretend() {
+	if kernel_is lt 2 6 27; then
+		eerror "${PN} require Linux kernel >= 2.6.27"
+		die "Please update your kernel!"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc ChangeLog README TODO
+}
diff --git a/dev-util/lttng-modules/lttng-modules-9999.ebuild b/dev-util/lttng-modules/lttng-modules-9999.ebuild
index 68002419a..1b9a3fb4d 100644
--- a/dev-util/lttng-modules/lttng-modules-9999.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit git-2 linux-mod
 
@@ -15,6 +15,30 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+MODULE_NAMES="
+	lttng-ring-buffer-client-discard(misc:)
+	lttng-ring-buffer-client-overwrite(misc:)
+	lttng-ring-buffer-metadata-client(misc:)
+	lttng-ring-buffer-client-mmap-discard(misc:)
+	lttng-ring-buffer-client-mmap-overwrite(misc:)
+	lttng-ring-buffer-metadata-mmap-client(misc:)
+	lttng-tracer(misc:)
+	lttng-statedump(misc:)
+	probes/lttng-probe-statedump(misc:)
+	probes/lttng-types(misc:)
+	probes/lttng-probe-timer(misc:)
+	probes/lttng-probe-sched(misc:)
+	probes/lttng-probe-signal(misc:)
+	probes/lttng-probe-lttng(misc:)
+	probes/lttng-probe-irq(misc:)
+	probes/lttng-kretprobes(misc:)
+	probes/lttng-probe-block(misc:)
+	probes/lttng-kprobes(misc:)
+	lib/lttng-lib-ring-buffer(misc:)
+"
+
+BUILD_TARGETS="default"
+
 CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
 	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
 
@@ -25,10 +49,7 @@ pkg_pretend() {
 	fi
 }
 
-src_compile() {
-	emake default
-}
-
 src_install() {
-	emake DESTDIR="${D}" INSTALL_MOD_PATH="${D}" modules_install
+	linux-mod_src_install
+	dodoc ChangeLog README TODO
 }